More hacking on static analyzer diagnostics. When emitting summary diagnostics the code paths for diagnostics involving paths or single locations are now unified. This patch also constifies many arguments/methods that are touched by this logic, leading to a nice overall code cleanup.

llvm-svn: 62903

2 files changed, 3 insertions, 3 deletions

diff --git a/clang/test/Analysis/NSString.m b/clang/test/Analysis/NSString.m
index e01c994d313..b123d62337c 100644
--- a/clang/test/Analysis/NSString.m
+++ b/clang/test/Analysis/NSString.m
@@ -194,7 +194,7 @@ void f12() {
 }
 
 - (id)notShared {
-  return [[SharedClass alloc] _init]; // expected-warning{{This violates the naming convention rules}}
+  return [[SharedClass alloc] _init]; // expected-warning{{[naming convention] leak of returned object}}
 }
 
 + (id)sharedInstance {
diff --git a/clang/test/Analysis/retain-release.m b/clang/test/Analysis/retain-release.m
index 2b16ae8ad86..0ce283ff24d 100644
--- a/clang/test/Analysis/retain-release.m
+++ b/clang/test/Analysis/retain-release.m
@@ -149,8 +149,8 @@ CFDateRef f6(int x) {
 
 CFDateRef f7() {
   CFDateRef date = CFDateCreate(0, CFAbsoluteTimeGetCurrent());
-  CFRetain(date); //expected-warning{{leak}}
-  date = CFDateCreate(0, CFAbsoluteTimeGetCurrent()); 
+  CFRetain(date);
+  date = CFDateCreate(0, CFAbsoluteTimeGetCurrent()); //expected-warning{{leak}}
   return date;
 }