From 207c68012ab26e1d9d95ec0ba3b6fb18b69a96c9 Mon Sep 17 00:00:00 2001
From: Anna Zaks <ganna@apple.com>
Date: Thu, 15 Sep 2011 20:06:34 +0000
Subject: [PATCH] [analyzer] Refactor: make PathDiagnosticLocation responsible
 for validation of SourceLocations (commit 4 of ?):  - The closing brace is
 always a single location, not a range.  - The test case previously had a
 location key 57:1 followed by a range [57:1 - 57:1].

llvm-svn: 139832
---
 clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp |  2 +-
 clang/test/Analysis/plist-output-alternate.m     | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp b/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
index 8dcb03bc159d..495451d261e4 100644
--- a/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+++ b/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
@@ -132,7 +132,7 @@ void PathDiagnosticClient::HandlePathDiagnostic(const PathDiagnostic *D) {
 
 PathDiagnosticLocation::PathDiagnosticLocation(const LocationContext *lc,
                                                const SourceManager &sm)
-  : K(RangeK), S(0), D(0), SM(&sm), LC(lc) {
+  : K(SingleLocK), S(0), D(0), SM(&sm), LC(lc) {
   SourceLocation L = LC->getDecl()->getBodyRBrace();
   R = SourceRange(L, L);
 }
diff --git a/clang/test/Analysis/plist-output-alternate.m b/clang/test/Analysis/plist-output-alternate.m
index b00a1612025b..997201150012 100644
--- a/clang/test/Analysis/plist-output-alternate.m
+++ b/clang/test/Analysis/plist-output-alternate.m
@@ -984,21 +984,6 @@ void rdar8331641(int x) {
 // CHECK:       <key>col</key><integer>1</integer>
 // CHECK:       <key>file</key><integer>0</integer>
 // CHECK:      </dict>
-// CHECK:      <key>ranges</key>
-// CHECK:      <array>
-// CHECK:        <array>
-// CHECK:         <dict>
-// CHECK:          <key>line</key><integer>57</integer>
-// CHECK:          <key>col</key><integer>1</integer>
-// CHECK:          <key>file</key><integer>0</integer>
-// CHECK:         </dict>
-// CHECK:         <dict>
-// CHECK:          <key>line</key><integer>57</integer>
-// CHECK:          <key>col</key><integer>1</integer>
-// CHECK:          <key>file</key><integer>0</integer>
-// CHECK:         </dict>
-// CHECK:        </array>
-// CHECK:      </array>
 // CHECK:      <key>extended_message</key>
 // CHECK:      <string>Object leaked: object allocated and stored into &apos;value&apos; is not referenced later in this execution path and has a retain count of +1</string>
 // CHECK:      <key>message</key>