Index: cfe/trunk/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist
===================================================================
--- cfe/trunk/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist
+++ cfe/trunk/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist
@@ -13,30 +13,30 @@
kindevent
location
- line7
- col12
+ line24
+ col3
file0
ranges
- line7
- col12
+ line24
+ col3
file0
- line7
- col18
+ line24
+ col10
file0
depth0
extended_message
- Memory is allocated
+ Attempt to free released memory
message
- Memory is allocated
+ Attempt to free released memory
kindcontrol
@@ -46,26 +46,26 @@
start
- line7
- col3
+ line17
+ col1
file0
- line7
- col5
+ line17
+ col4
file0
end
- line9
+ line18
col3
file0
- line9
- col4
+ line18
+ col5
file0
@@ -73,6 +73,35 @@
+ kindevent
+ location
+
+ line18
+ col12
+ file0
+
+ ranges
+
+
+
+ line18
+ col12
+ file0
+
+
+ line18
+ col18
+ file0
+
+
+
+ depth0
+ extended_message
+ Memory is allocated
+ message
+ Memory is allocated
+
+
kindcontrol
edges
@@ -80,26 +109,26 @@
start
- line9
+ line18
col3
file0
- line9
- col4
+ line18
+ col5
file0
end
- line9
- col7
+ line20
+ col3
file0
- line9
- col7
+ line20
+ col4
file0
@@ -107,34 +136,6 @@
- kindpop-up
- location
-
- line9
- col7
- file0
-
- ranges
-
-
-
- line9
- col7
- file0
-
-
- line9
- col7
- file0
-
-
-
- extended_message
- 'p' is non-null
- message
- 'p' is non-null
-
-
kindcontrol
edges
@@ -142,25 +143,25 @@
start
- line9
- col7
+ line20
+ col3
file0
- line9
- col7
+ line20
+ col4
file0
end
- line11
+ line21
col5
file0
- line11
+ line21
col10
file0
@@ -172,7 +173,7 @@
kindevent
location
- line11
+ line21
col5
file0
@@ -180,12 +181,12 @@
- line11
+ line21
col5
file0
- line11
+ line21
col12
file0
@@ -205,12 +206,12 @@
start
- line11
+ line21
col5
file0
- line11
+ line21
col10
file0
@@ -218,12 +219,12 @@
end
- line14
+ line24
col3
file0
- line14
+ line24
col8
file0
@@ -231,35 +232,6 @@
-
- kindevent
- location
-
- line14
- col3
- file0
-
- ranges
-
-
-
- line14
- col3
- file0
-
-
- line14
- col10
- file0
-
-
-
- depth0
- extended_message
- Attempt to free released memory
- message
- Attempt to free released memory
-
descriptionAttempt to free released memory
categoryMemory error
@@ -269,10 +241,10 @@
issue_hash_content_of_line_in_contextbd8e324d09c70b9e2be6f824a4942e5a
issue_context_kindfunction
issue_contexttest
- issue_hash_function_offset8
+ issue_hash_function_offset7
location
- line14
+ line24
col3
file0
@@ -280,11 +252,11 @@
0
- 6
- 7
- 9
- 11
- 14
+ 17
+ 18
+ 20
+ 21
+ 24
@@ -295,7 +267,7 @@
kindevent
location
- line25
+ line35
col2
file0
@@ -303,12 +275,12 @@
- line25
+ line35
col2
file0
- line25
+ line35
col12
file0
@@ -324,7 +296,7 @@
kindevent
location
- line19
+ line29
col2
file0
@@ -342,12 +314,12 @@
start
- line19
+ line29
col2
file0
- line19
+ line29
col5
file0
@@ -355,12 +327,12 @@
end
- line20
+ line30
col3
file0
- line20
+ line30
col8
file0
@@ -372,7 +344,7 @@
kindevent
location
- line20
+ line30
col3
file0
@@ -380,12 +352,12 @@
- line20
+ line30
col3
file0
- line20
+ line30
col13
file0
@@ -401,7 +373,7 @@
kindevent
location
- line25
+ line35
col2
file0
@@ -409,12 +381,12 @@
- line25
+ line35
col2
file0
- line25
+ line35
col12
file0
@@ -434,12 +406,12 @@
start
- line25
+ line35
col2
file0
- line25
+ line35
col4
file0
@@ -447,12 +419,12 @@
end
- line27
+ line37
col2
file0
- line27
+ line37
col7
file0
@@ -464,7 +436,7 @@
kindevent
location
- line27
+ line37
col2
file0
@@ -472,12 +444,12 @@
- line27
+ line37
col2
file0
- line27
+ line37
col11
file0
@@ -501,7 +473,7 @@
issue_hash_function_offset3
location
- line27
+ line37
col2
file0
@@ -509,11 +481,11 @@
0
- 19
- 20
- 24
- 25
- 27
+ 29
+ 30
+ 34
+ 35
+ 37
Index: cfe/trunk/test/Analysis/NewDelete-path-notes.cpp
===================================================================
--- cfe/trunk/test/Analysis/NewDelete-path-notes.cpp
+++ cfe/trunk/test/Analysis/NewDelete-path-notes.cpp
@@ -1,13 +1,23 @@
-// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.NewDelete,unix.Malloc -analyzer-output=text -verify %s
-// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.NewDelete,unix.Malloc -analyzer-output=text -analyzer-config c++-allocator-inlining=true -verify %s
-// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.NewDelete,unix.Malloc -analyzer-output=plist %s -o %t.plist
-// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/NewDelete-path-notes.cpp.plist -
+// RUN: %clang_analyze_cc1 \
+// RUN: -analyzer-checker=cplusplus.NewDelete,unix.Malloc \
+// RUN: -analyzer-config add-pop-up-notes=false \
+// RUN: -analyzer-output=text -verify %s
+// RUN: %clang_analyze_cc1 \
+// RUN: -analyzer-checker=cplusplus.NewDelete,unix.Malloc \
+// RUN: -analyzer-config c++-allocator-inlining=true \
+// RUN: -analyzer-config add-pop-up-notes=false \
+// RUN: -analyzer-output=text -verify %s
+// RUN: %clang_analyze_cc1 \
+// RUN: -analyzer-checker=cplusplus.NewDelete,unix.Malloc \
+// RUN: -analyzer-config add-pop-up-notes=false \
+// RUN: -analyzer-output=plist %s -o %t.plist
+// RUN: cat %t.plist | %diff_plist \
+// RUN: %S/Inputs/expected-plists/NewDelete-path-notes.cpp.plist -
void test() {
int *p = new int;
// expected-note@-1 {{Memory is allocated}}
- if (p) // expected-note {{'p' is non-null}}
- // expected-note@-1 {{Taking true branch}}
+ if (p) // expected-note {{Taking true branch}}
delete p;
// expected-note@-1 {{Memory is released}}