Index: cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp =================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp +++ cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp @@ -985,12 +985,8 @@ if (!S || !N) return false; - if (const Expr *Ex = dyn_cast(S)) { - Ex = Ex->IgnoreParenCasts(); - const Expr *PeeledEx = peelOffOuterExpr(Ex, N); - if (Ex != PeeledEx) - S = PeeledEx; - } + if (const Expr *Ex = dyn_cast(S)) + S = peelOffOuterExpr(Ex, N); const Expr *Inner = nullptr; if (const Expr *Ex = dyn_cast(S)) { Index: cfe/trunk/test/Analysis/inlining/false-positive-suppression.m =================================================================== --- cfe/trunk/test/Analysis/inlining/false-positive-suppression.m +++ cfe/trunk/test/Analysis/inlining/false-positive-suppression.m @@ -5,7 +5,7 @@ #define ARC __has_feature(objc_arc) -#if defined(SUPPRESSED) && !ARC +#ifdef SUPPRESSED // expected-no-diagnostics #endif @@ -27,9 +27,8 @@ void testNilReceiverHelperB(int *x) { *x = 1; -// FIXME: Suppression for this case isn't working under ARC. It should. -#if !defined(SUPPRESSED) || (defined(SUPPRESSED) && ARC) - // expected-warning@-3 {{Dereference of null pointer}} +#if !defined(SUPPRESSED) + // expected-warning@-2 {{Dereference of null pointer}} #endif } Index: cfe/trunk/test/Analysis/inlining/inline-defensive-checks.c =================================================================== --- cfe/trunk/test/Analysis/inlining/inline-defensive-checks.c +++ cfe/trunk/test/Analysis/inlining/inline-defensive-checks.c @@ -197,6 +197,12 @@ **x = 7; // expected-warning{{Dereference of null pointer}} } +void idcTrackConstraintThroughSymbolicRegionAndParens(int **x) { + idc(*x); + // FIXME: Should not warn. + *(*x) = 7; // expected-warning{{Dereference of null pointer}} +} + int *idcPlainNull(int coin) { if (coin) return 0; @@ -208,3 +214,30 @@ *x = idcPlainNull(coin); **x = 7; // no-warning } + +void idcTrackZeroValueThroughSymbolicRegionAndParens(int coin, int **x) { + *x = idcPlainNull(coin); + *(*x) = 7; // no-warning +} + +struct WithInt { + int i; +}; + +struct WithArray { + struct WithInt arr[1]; +}; + +struct WithArray *idcPlainNullWithArray(int coin) { + if (coin) + return 0; + static struct WithArray S; + return &S; +} + +void idcTrackZeroValueThroughSymbolicRegionWithArray(int coin, struct WithArray **s) { + *s = idcPlainNullWithArray(coin); + (*s)->arr[0].i = 1; // no-warning + // Same thing. + (*s)->arr->i = 1; // no-warning +} Index: cfe/trunk/test/Analysis/inlining/path-notes.cpp =================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.cpp +++ cfe/trunk/test/Analysis/inlining/path-notes.cpp @@ -163,8 +163,10 @@ const int &getZeroByRef() { static int zeroVar; + // FIXME: Duplicate diagnostics! zeroVar = 0; // expected-note@-1 {{The value 0 is assigned to 'zeroVar'}} + // expected-note@-2 {{The value 0 is assigned to 'zeroVar'}} return zeroVar; // expected-note@-1 {{Returning zero (reference to 'zeroVar')}} } @@ -2938,12 +2940,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2951,12 +2953,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col29 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2968,7 +2970,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2976,12 +2978,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col31 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3074,7 +3076,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3082,12 +3084,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col31 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3107,12 +3109,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col29 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3120,12 +3122,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3137,7 +3139,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3145,12 +3147,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col19 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col31 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3174,7 +3176,7 @@ // CHECK-NEXT: issue_hash_function_offset1 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line173 +// CHECK-NEXT: line175 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3190,12 +3192,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3203,12 +3205,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col34 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3220,7 +3222,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3228,12 +3230,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col36 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3314,12 +3316,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line166 +// CHECK-NEXT: line167 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line166 +// CHECK-NEXT: line167 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3331,7 +3333,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line166 +// CHECK-NEXT: line167 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3339,12 +3341,41 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line166 +// CHECK-NEXT: line167 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line166 +// CHECK-NEXT: line167 +// CHECK-NEXT: col15 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: depth1 +// CHECK-NEXT: extended_message +// CHECK-NEXT: The value 0 is assigned to 'zeroVar' +// CHECK-NEXT: message +// CHECK-NEXT: The value 0 is assigned to 'zeroVar' +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindevent +// CHECK-NEXT: location +// CHECK-NEXT: +// CHECK-NEXT: line167 +// CHECK-NEXT: col5 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: ranges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line167 +// CHECK-NEXT: col5 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line167 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3364,12 +3395,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line166 +// CHECK-NEXT: line167 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line166 +// CHECK-NEXT: line167 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3377,12 +3408,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line168 +// CHECK-NEXT: line170 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line168 +// CHECK-NEXT: line170 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3394,7 +3425,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line168 +// CHECK-NEXT: line170 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3402,12 +3433,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line168 +// CHECK-NEXT: line170 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line168 +// CHECK-NEXT: line170 // CHECK-NEXT: col18 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3423,7 +3454,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3431,12 +3462,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col36 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3456,12 +3487,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col34 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3469,12 +3500,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3486,7 +3517,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3494,12 +3525,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col19 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col36 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3523,7 +3554,7 @@ // CHECK-NEXT: issue_hash_function_offset1 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line180 +// CHECK-NEXT: line182 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3535,7 +3566,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line188 +// CHECK-NEXT: line190 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3543,12 +3574,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line188 +// CHECK-NEXT: line190 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line188 +// CHECK-NEXT: line190 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3568,12 +3599,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line188 +// CHECK-NEXT: line190 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line188 +// CHECK-NEXT: line190 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3581,12 +3612,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line190 +// CHECK-NEXT: line192 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line190 +// CHECK-NEXT: line192 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3598,7 +3629,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line190 +// CHECK-NEXT: line192 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3606,12 +3637,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line190 +// CHECK-NEXT: line192 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line190 +// CHECK-NEXT: line192 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3635,7 +3666,7 @@ // CHECK-NEXT: issue_hash_function_offset3 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line190 +// CHECK-NEXT: line192 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3647,7 +3678,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line203 +// CHECK-NEXT: line205 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3655,12 +3686,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line203 +// CHECK-NEXT: line205 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line203 +// CHECK-NEXT: line205 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3680,12 +3711,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line203 +// CHECK-NEXT: line205 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line203 +// CHECK-NEXT: line205 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3693,12 +3724,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col19 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3714,12 +3745,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col19 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3727,12 +3758,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3744,7 +3775,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3752,12 +3783,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3777,12 +3808,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3790,12 +3821,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3807,7 +3838,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3815,12 +3846,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line205 +// CHECK-NEXT: line207 // CHECK-NEXT: col24 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3836,7 +3867,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3854,12 +3885,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col19 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3867,12 +3898,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col35 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col35 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3888,12 +3919,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col35 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col35 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3901,12 +3932,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col31 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col33 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3918,7 +3949,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col31 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3936,12 +3967,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col31 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line196 +// CHECK-NEXT: line198 // CHECK-NEXT: col33 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3949,12 +3980,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line197 +// CHECK-NEXT: line199 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line197 +// CHECK-NEXT: line199 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3966,7 +3997,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line197 +// CHECK-NEXT: line199 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -3974,12 +4005,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line197 +// CHECK-NEXT: line199 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line197 +// CHECK-NEXT: line199 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4001,7 +4032,7 @@ // CHECK-NEXT: issue_hash_function_offset1 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line197 +// CHECK-NEXT: line199 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4013,7 +4044,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line210 +// CHECK-NEXT: line212 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4021,12 +4052,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line210 +// CHECK-NEXT: line212 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line210 +// CHECK-NEXT: line212 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4046,12 +4077,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line210 +// CHECK-NEXT: line212 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line210 +// CHECK-NEXT: line212 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4059,12 +4090,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line211 +// CHECK-NEXT: line213 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line211 +// CHECK-NEXT: line213 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4076,7 +4107,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line211 +// CHECK-NEXT: line213 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4084,12 +4115,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line211 +// CHECK-NEXT: line213 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line211 +// CHECK-NEXT: line213 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4109,12 +4140,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line211 +// CHECK-NEXT: line213 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line211 +// CHECK-NEXT: line213 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4122,12 +4153,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4143,12 +4174,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4156,12 +4187,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4173,7 +4204,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4181,12 +4212,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4210,7 +4241,7 @@ // CHECK-NEXT: issue_hash_function_offset3 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line212 +// CHECK-NEXT: line214 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4222,7 +4253,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line220 +// CHECK-NEXT: line222 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4230,12 +4261,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line220 +// CHECK-NEXT: line222 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line220 +// CHECK-NEXT: line222 // CHECK-NEXT: col9 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4255,12 +4286,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line220 +// CHECK-NEXT: line222 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line220 +// CHECK-NEXT: line222 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4268,12 +4299,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line221 +// CHECK-NEXT: line223 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line221 +// CHECK-NEXT: line223 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4285,7 +4316,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line221 +// CHECK-NEXT: line223 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4293,12 +4324,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line221 +// CHECK-NEXT: line223 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line221 +// CHECK-NEXT: line223 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4322,7 +4353,7 @@ // CHECK-NEXT: issue_hash_function_offset2 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line221 +// CHECK-NEXT: line223 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4338,12 +4369,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4351,12 +4382,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4368,7 +4399,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4376,12 +4407,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4401,12 +4432,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col6 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line234 +// CHECK-NEXT: line236 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4414,12 +4445,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4435,12 +4466,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4448,12 +4479,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4465,7 +4496,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4473,12 +4504,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4502,7 +4533,7 @@ // CHECK-NEXT: issue_hash_function_offset4 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line237 +// CHECK-NEXT: line239 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4514,7 +4545,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line242 +// CHECK-NEXT: line244 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4522,12 +4553,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line242 +// CHECK-NEXT: line244 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line242 +// CHECK-NEXT: line244 // CHECK-NEXT: col21 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4547,12 +4578,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line242 +// CHECK-NEXT: line244 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line242 +// CHECK-NEXT: line244 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4560,12 +4591,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line243 +// CHECK-NEXT: line245 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line243 +// CHECK-NEXT: line245 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4577,7 +4608,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line243 +// CHECK-NEXT: line245 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4585,12 +4616,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line243 +// CHECK-NEXT: line245 // CHECK-NEXT: col2 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line243 +// CHECK-NEXT: line245 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4614,7 +4645,7 @@ // CHECK-NEXT: issue_hash_function_offset2 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line243 +// CHECK-NEXT: line245 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4626,7 +4657,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line254 +// CHECK-NEXT: line256 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4634,12 +4665,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line254 +// CHECK-NEXT: line256 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line254 +// CHECK-NEXT: line256 // CHECK-NEXT: col14 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4659,12 +4690,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line254 +// CHECK-NEXT: line256 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line254 +// CHECK-NEXT: line256 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4672,12 +4703,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4693,12 +4724,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4706,12 +4737,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4723,7 +4754,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4731,12 +4762,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4756,12 +4787,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line259 +// CHECK-NEXT: line261 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4769,12 +4800,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line261 +// CHECK-NEXT: line263 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line261 +// CHECK-NEXT: line263 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4786,7 +4817,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line261 +// CHECK-NEXT: line263 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4794,12 +4825,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line261 +// CHECK-NEXT: line263 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line261 +// CHECK-NEXT: line263 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4823,7 +4854,7 @@ // CHECK-NEXT: issue_hash_function_offset8 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line261 +// CHECK-NEXT: line263 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4839,12 +4870,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4852,12 +4883,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col38 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4869,7 +4900,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4877,12 +4908,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col41 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4898,7 +4929,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4906,12 +4937,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line273 +// CHECK-NEXT: line275 // CHECK-NEXT: col41 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4927,7 +4958,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line268 +// CHECK-NEXT: line270 // CHECK-NEXT: col1 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4945,12 +4976,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line268 +// CHECK-NEXT: line270 // CHECK-NEXT: col1 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line268 +// CHECK-NEXT: line270 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4958,12 +4989,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4979,12 +5010,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -4992,12 +5023,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5009,7 +5040,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5017,12 +5048,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col16 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5046,7 +5077,7 @@ // CHECK-NEXT: issue_hash_function_offset1 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line269 +// CHECK-NEXT: line271 // CHECK-NEXT: col13 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5058,7 +5089,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line296 +// CHECK-NEXT: line298 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5066,12 +5097,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line296 +// CHECK-NEXT: line298 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line296 +// CHECK-NEXT: line298 // CHECK-NEXT: col16 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5087,7 +5118,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line289 +// CHECK-NEXT: line291 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5105,12 +5136,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line289 +// CHECK-NEXT: line291 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line289 +// CHECK-NEXT: line291 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5118,12 +5149,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line290 +// CHECK-NEXT: line292 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line290 +// CHECK-NEXT: line292 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5135,7 +5166,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line290 +// CHECK-NEXT: line292 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5143,12 +5174,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line290 +// CHECK-NEXT: line292 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line290 +// CHECK-NEXT: line292 // CHECK-NEXT: col18 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5164,7 +5195,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line280 +// CHECK-NEXT: line282 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5182,12 +5213,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line280 +// CHECK-NEXT: line282 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line280 +// CHECK-NEXT: line282 // CHECK-NEXT: col5 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5195,12 +5226,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5216,12 +5247,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5229,12 +5260,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5246,7 +5277,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5254,12 +5285,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col28 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -5281,7 +5312,7 @@ // CHECK-NEXT: issue_hash_function_offset1 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line281 +// CHECK-NEXT: line283 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: Index: cfe/trunk/test/Analysis/inlining/path-notes.m =================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.m +++ cfe/trunk/test/Analysis/inlining/path-notes.m @@ -136,11 +136,19 @@ // expected-note@-1 {{Dereference of null pointer (loaded from variable 'x')}} } -void testNilReceiver(id *x) { - if (*x) { // expected-note {{Assuming the condition is false}} +void testNilReceiver(id *x, id *y, id *z) { + // FIXME: Should say "Assuming pointer value is null" instead. + // For some reason we're displaying different notes for + // tracked and untracked pointers. + if (*y) {} // expected-note {{Assuming the condition is false}} + // expected-note@-1 {{Taking false branch}} + if (*x) { // expected-note {{Assuming pointer value is null}} // expected-note@-1 {{Taking false branch}} return; } + // FIXME: Should say "Assuming pointer value is null" instead. + if (*z) {} // expected-note {{Assuming the condition is false}} + // expected-note@-1 {{Taking false branch}} testNilReceiverHelper([*x getPtr]); // expected-note@-1 {{'getPtr' not called because the receiver is nil}} // expected-note@-2 {{Passing null pointer value via 1st parameter 'x'}} @@ -1158,12 +1166,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1171,12 +1179,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1188,7 +1196,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1196,12 +1204,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1221,12 +1229,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line140 +// CHECK-NEXT: line143 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1234,12 +1242,206 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line145 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line145 +// CHECK-NEXT: col4 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindcontrol +// CHECK-NEXT: edges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: start +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col3 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col4 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: end +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindevent +// CHECK-NEXT: location +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: ranges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col8 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: depth0 +// CHECK-NEXT: extended_message +// CHECK-NEXT: Assuming pointer value is null +// CHECK-NEXT: message +// CHECK-NEXT: Assuming pointer value is null +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindcontrol +// CHECK-NEXT: edges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: start +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line145 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: end +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col3 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col4 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindcontrol +// CHECK-NEXT: edges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: start +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col3 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col4 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: end +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindevent +// CHECK-NEXT: location +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: ranges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col8 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: depth0 +// CHECK-NEXT: extended_message +// CHECK-NEXT: Assuming the condition is false +// CHECK-NEXT: message +// CHECK-NEXT: Assuming the condition is false +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindcontrol +// CHECK-NEXT: edges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: start +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line150 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: end +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line152 +// CHECK-NEXT: col3 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line152 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1255,12 +1457,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1268,12 +1470,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1285,7 +1487,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1293,12 +1495,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col27 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1318,12 +1520,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col26 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1331,12 +1533,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col25 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col25 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1348,7 +1550,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col25 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1356,12 +1558,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col25 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col35 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1377,7 +1579,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1385,12 +1587,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line144 +// CHECK-NEXT: line152 // CHECK-NEXT: col36 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1541,12 +1743,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1554,12 +1756,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1571,7 +1773,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1579,12 +1781,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1604,12 +1806,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col7 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line151 +// CHECK-NEXT: line159 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1617,12 +1819,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1638,12 +1840,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1651,12 +1853,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1668,7 +1870,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1676,12 +1878,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col19 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col23 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1705,7 +1907,7 @@ // CHECK-NEXT: issue_hash_function_offset3 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line153 +// CHECK-NEXT: line161 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1721,12 +1923,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line159 +// CHECK-NEXT: line167 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line159 +// CHECK-NEXT: line167 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1734,12 +1936,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line160 +// CHECK-NEXT: line168 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line160 +// CHECK-NEXT: line168 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1755,12 +1957,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line160 +// CHECK-NEXT: line168 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line160 +// CHECK-NEXT: line168 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1768,12 +1970,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1789,12 +1991,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col4 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1802,12 +2004,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1819,7 +2021,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1827,12 +2029,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col34 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1852,12 +2054,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1865,12 +2067,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1882,7 +2084,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1890,24 +2092,24 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col47 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col12 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col34 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1927,12 +2129,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1940,12 +2142,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1957,7 +2159,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -1965,24 +2167,24 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col60 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col11 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col47 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2002,12 +2204,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line162 +// CHECK-NEXT: line170 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2015,12 +2217,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line167 +// CHECK-NEXT: line175 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line167 +// CHECK-NEXT: line175 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2036,12 +2238,12 @@ // CHECK-NEXT: start // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line167 +// CHECK-NEXT: line175 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line167 +// CHECK-NEXT: line175 // CHECK-NEXT: col15 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2049,12 +2251,12 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line169 +// CHECK-NEXT: line177 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line169 +// CHECK-NEXT: line177 // CHECK-NEXT: col8 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2066,7 +2268,7 @@ // CHECK-NEXT: kindevent // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line169 +// CHECK-NEXT: line177 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2074,12 +2276,12 @@ // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line169 +// CHECK-NEXT: line177 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: // CHECK-NEXT: -// CHECK-NEXT: line169 +// CHECK-NEXT: line177 // CHECK-NEXT: col10 // CHECK-NEXT: file0 // CHECK-NEXT: @@ -2103,7 +2305,7 @@ // CHECK-NEXT: issue_hash_function_offset11 // CHECK-NEXT: location // CHECK-NEXT: -// CHECK-NEXT: line169 +// CHECK-NEXT: line177 // CHECK-NEXT: col3 // CHECK-NEXT: file0 // CHECK-NEXT: Index: cfe/trunk/test/Analysis/uninit-const.cpp =================================================================== --- cfe/trunk/test/Analysis/uninit-const.cpp +++ cfe/trunk/test/Analysis/uninit-const.cpp @@ -52,7 +52,7 @@ } void f6_1(void) { - int t; + int t; // expected-note{{'t' declared without an initial value}} int p = f6_1_sub(t); //expected-warning {{Assigned value is garbage or undefined}} //expected-note@-1 {{Calling 'f6_1_sub'}} //expected-note@-2 {{Returning from 'f6_1_sub'}}