From 526d93c55de364e5b457cbcd024f0cb7b47a6315 Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Fri, 12 Apr 2013 00:44:17 +0000 Subject: [analyzer] Show "Returning from ..." note at caller's depth, not callee's. Before: 1. Calling 'foo' 2. Doing something interesting 3. Returning from 'foo' 4. Some kind of error here After: 1. Calling 'foo' 2. Doing something interesting 3. Returning from 'foo' 4. Some kind of error here The location of the note is already in the caller, not the callee, so this just brings the "depth" attribute in line with that. This only affects plist diagnostic consumers (i.e. Xcode). It's necessary for Xcode to associate the control flow arrows with the right stack frame. llvm-svn: 179351 --- .../test/Analysis/diagnostics/undef-value-param.c | 6 +- .../test/Analysis/diagnostics/undef-value-param.m | 193 +++++++++++---------- clang/test/Analysis/inline-plist.c | 6 +- .../inlining/eager-reclamation-path-notes.cpp | 2 +- clang/test/Analysis/inlining/path-notes.c | 12 +- clang/test/Analysis/inlining/path-notes.cpp | 4 +- clang/test/Analysis/inlining/path-notes.m | 6 +- clang/test/Analysis/malloc-plist.c | 16 +- clang/test/Analysis/retain-release-path-notes.m | 4 +- 9 files changed, 125 insertions(+), 124 deletions(-) (limited to 'clang/test/Analysis') diff --git a/clang/test/Analysis/diagnostics/undef-value-param.c b/clang/test/Analysis/diagnostics/undef-value-param.c index 597bf91fa24..b460be19489 100644 --- a/clang/test/Analysis/diagnostics/undef-value-param.c +++ b/clang/test/Analysis/diagnostics/undef-value-param.c @@ -328,7 +328,7 @@ double testPassingParentRegionStruct(int x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'foo' // CHECK-NEXT: message @@ -713,7 +713,7 @@ double testPassingParentRegionStruct(int x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'initArray' // CHECK-NEXT: message @@ -1127,7 +1127,7 @@ double testPassingParentRegionStruct(int x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'initStruct' // CHECK-NEXT: message diff --git a/clang/test/Analysis/diagnostics/undef-value-param.m b/clang/test/Analysis/diagnostics/undef-value-param.m index d6c8a16795a..4de83bfb9c8 100644 --- a/clang/test/Analysis/diagnostics/undef-value-param.m +++ b/clang/test/Analysis/diagnostics/undef-value-param.m @@ -1,5 +1,6 @@ // RUN: %clang_cc1 -analyze -analyzer-checker=core,osx -analyzer-output=text -verify %s -// RUN: %clang_cc1 -analyze -analyzer-checker=core,osx -analyzer-output=plist-multi-file %s -o - | FileCheck %s +// RUN: %clang_cc1 -analyze -analyzer-checker=core,osx -analyzer-output=plist-multi-file %s -o %t.plist +// RUN: FileCheck --input-file=%t.plist %s typedef signed char BOOL; @protocol NSObject - (BOOL)isEqual:(id)object; @end @@ -86,12 +87,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line34 +// CHECK-NEXT: line35 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line34 +// CHECK-NEXT: line35 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -99,12 +100,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -116,7 +117,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -124,12 +125,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col27 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -145,7 +146,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line52 +// CHECK-NEXT: line53 // CHECK-NEXT: col1 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -163,12 +164,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line52 +// CHECK-NEXT: line53 // CHECK-NEXT: col1 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line52 +// CHECK-NEXT: line53 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -176,12 +177,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line53 +// CHECK-NEXT: line54 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line53 +// CHECK-NEXT: line54 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -197,12 +198,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line53 +// CHECK-NEXT: line54 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line53 +// CHECK-NEXT: line54 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -210,12 +211,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -231,12 +232,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -244,12 +245,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -261,7 +262,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -269,12 +270,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -294,12 +295,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line55 +// CHECK-NEXT: line56 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -307,12 +308,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line58 +// CHECK-NEXT: line59 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line58 +// CHECK-NEXT: line59 // CHECK-NEXT: col17 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -328,12 +329,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line58 +// CHECK-NEXT: line59 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line58 +// CHECK-NEXT: line59 // CHECK-NEXT: col17 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -341,12 +342,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line59 +// CHECK-NEXT: line60 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line59 +// CHECK-NEXT: line60 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -358,7 +359,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line59 +// CHECK-NEXT: line60 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -366,12 +367,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line59 +// CHECK-NEXT: line60 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line59 +// CHECK-NEXT: line60 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -391,12 +392,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line59 +// CHECK-NEXT: line60 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line59 +// CHECK-NEXT: line60 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -404,12 +405,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line61 +// CHECK-NEXT: line62 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line61 +// CHECK-NEXT: line62 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -421,7 +422,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line61 +// CHECK-NEXT: line62 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -429,12 +430,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line61 +// CHECK-NEXT: line62 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line61 +// CHECK-NEXT: line62 // CHECK-NEXT: col19 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -450,7 +451,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -458,18 +459,18 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col27 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'CreateRef' // CHECK-NEXT: message @@ -483,12 +484,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line35 +// CHECK-NEXT: line36 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -496,12 +497,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line38 +// CHECK-NEXT: line39 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line38 +// CHECK-NEXT: line39 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -513,7 +514,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line38 +// CHECK-NEXT: line39 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -521,12 +522,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line38 +// CHECK-NEXT: line39 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line38 +// CHECK-NEXT: line39 // CHECK-NEXT: col22 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -547,7 +548,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: issue_hash5 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line38 +// CHECK-NEXT: line39 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -559,7 +560,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line43 +// CHECK-NEXT: line44 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -567,12 +568,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line43 +// CHECK-NEXT: line44 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line43 +// CHECK-NEXT: line44 // CHECK-NEXT: col30 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -592,12 +593,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line43 +// CHECK-NEXT: line44 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line43 +// CHECK-NEXT: line44 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -605,12 +606,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col18 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -622,7 +623,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -630,12 +631,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col32 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -651,7 +652,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line64 +// CHECK-NEXT: line65 // CHECK-NEXT: col1 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -669,12 +670,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line64 +// CHECK-NEXT: line65 // CHECK-NEXT: col1 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line64 +// CHECK-NEXT: line65 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -682,12 +683,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line65 +// CHECK-NEXT: line66 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line65 +// CHECK-NEXT: line66 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -703,12 +704,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line65 +// CHECK-NEXT: line66 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line65 +// CHECK-NEXT: line66 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -716,12 +717,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -737,12 +738,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -750,12 +751,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -767,7 +768,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -775,12 +776,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -800,12 +801,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line67 +// CHECK-NEXT: line68 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -813,12 +814,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line70 +// CHECK-NEXT: line71 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line70 +// CHECK-NEXT: line71 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -830,7 +831,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -838,18 +839,18 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col32 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'CreateRefUndef' // CHECK-NEXT: message @@ -863,12 +864,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line44 +// CHECK-NEXT: line45 // CHECK-NEXT: col18 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -876,12 +877,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line47 +// CHECK-NEXT: line48 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line47 +// CHECK-NEXT: line48 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -893,7 +894,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line47 +// CHECK-NEXT: line48 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -901,12 +902,12 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line47 +// CHECK-NEXT: line48 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line47 +// CHECK-NEXT: line48 // CHECK-NEXT: col22 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -927,7 +928,7 @@ static void CreateRefUndef(SCDynamicStoreRef *storeRef, unsigned x) { // CHECK-NEXT: issue_hash5 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line47 +// CHECK-NEXT: line48 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: diff --git a/clang/test/Analysis/inline-plist.c b/clang/test/Analysis/inline-plist.c index b969c5f6579..32d1fde086b 100644 --- a/clang/test/Analysis/inline-plist.c +++ b/clang/test/Analysis/inline-plist.c @@ -1214,7 +1214,7 @@ void test_block_arg() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning to caller // CHECK-NEXT: message @@ -1526,7 +1526,7 @@ void test_block_arg() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning to caller // CHECK-NEXT: message @@ -1775,7 +1775,7 @@ void test_block_arg() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning to caller // CHECK-NEXT: message diff --git a/clang/test/Analysis/inlining/eager-reclamation-path-notes.cpp b/clang/test/Analysis/inlining/eager-reclamation-path-notes.cpp index 08c84695ccb..05411bbc777 100644 --- a/clang/test/Analysis/inlining/eager-reclamation-path-notes.cpp +++ b/clang/test/Analysis/inlining/eager-reclamation-path-notes.cpp @@ -202,7 +202,7 @@ int memberCallBaseDisappears() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getNullWrapper' // CHECK-NEXT: message diff --git a/clang/test/Analysis/inlining/path-notes.c b/clang/test/Analysis/inlining/path-notes.c index 07bc824dde6..22723306897 100644 --- a/clang/test/Analysis/inlining/path-notes.c +++ b/clang/test/Analysis/inlining/path-notes.c @@ -241,7 +241,7 @@ void testUseOfNullPointer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'zero' // CHECK-NEXT: message @@ -1108,7 +1108,7 @@ void testUseOfNullPointer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZero' // CHECK-NEXT: message @@ -1420,7 +1420,7 @@ void testUseOfNullPointer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZero' // CHECK-NEXT: message @@ -1732,7 +1732,7 @@ void testUseOfNullPointer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZero' // CHECK-NEXT: message @@ -2107,7 +2107,7 @@ void testUseOfNullPointer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZero' // CHECK-NEXT: message @@ -2482,7 +2482,7 @@ void testUseOfNullPointer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZero' // CHECK-NEXT: message diff --git a/clang/test/Analysis/inlining/path-notes.cpp b/clang/test/Analysis/inlining/path-notes.cpp index e78c05249e5..8293095efe6 100644 --- a/clang/test/Analysis/inlining/path-notes.cpp +++ b/clang/test/Analysis/inlining/path-notes.cpp @@ -2705,7 +2705,7 @@ void testPathNoteOnInitializer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZero' // CHECK-NEXT: message @@ -3051,7 +3051,7 @@ void testPathNoteOnInitializer() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZeroByRef' // CHECK-NEXT: message diff --git a/clang/test/Analysis/inlining/path-notes.m b/clang/test/Analysis/inlining/path-notes.m index af3e3c30dde..17256137972 100644 --- a/clang/test/Analysis/inlining/path-notes.m +++ b/clang/test/Analysis/inlining/path-notes.m @@ -393,7 +393,7 @@ int testDispatchSyncInliningNoPruning(int coin) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'getZeroIfNil' // CHECK-NEXT: message @@ -655,7 +655,7 @@ int testDispatchSyncInliningNoPruning(int coin) { // CHECK-NEXT: col1 // CHECK-NEXT: file0 // CHECK-NEXT: -// CHECK-NEXT: depth2 +// CHECK-NEXT: depth1 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning to caller // CHECK-NEXT: message @@ -684,7 +684,7 @@ int testDispatchSyncInliningNoPruning(int coin) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'dispatch_sync' // CHECK-NEXT: message diff --git a/clang/test/Analysis/malloc-plist.c b/clang/test/Analysis/malloc-plist.c index 6ec277491a9..8d4362b8ac9 100644 --- a/clang/test/Analysis/malloc-plist.c +++ b/clang/test/Analysis/malloc-plist.c @@ -1296,7 +1296,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returned allocated memory // CHECK-NEXT: message @@ -1738,7 +1738,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth2 +// CHECK-NEXT: depth1 // CHECK-NEXT: extended_message // CHECK-NEXT: Returned released memory via 1st parameter // CHECK-NEXT: message @@ -1801,7 +1801,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returned released memory via 1st parameter // CHECK-NEXT: message @@ -2375,7 +2375,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Reallocation of 1st parameter failed // CHECK-NEXT: message @@ -2643,7 +2643,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returned allocated memory // CHECK-NEXT: message @@ -4463,7 +4463,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returned allocated memory // CHECK-NEXT: message @@ -4697,7 +4697,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returned allocated memory // CHECK-NEXT: message @@ -4965,7 +4965,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returned allocated memory // CHECK-NEXT: message diff --git a/clang/test/Analysis/retain-release-path-notes.m b/clang/test/Analysis/retain-release-path-notes.m index ea943d1ca93..0e26e173360 100644 --- a/clang/test/Analysis/retain-release-path-notes.m +++ b/clang/test/Analysis/retain-release-path-notes.m @@ -4907,7 +4907,7 @@ static int Cond; // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'initX' // CHECK-NEXT: message @@ -5224,7 +5224,7 @@ static int Cond; // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: depth1 +// CHECK-NEXT: depth0 // CHECK-NEXT: extended_message // CHECK-NEXT: Returning from 'initY' // CHECK-NEXT: message -- cgit v1.2.3