more SourceLocation lexicon change: instead of referring to the
"logical" location, refer to the "instantiation" location.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62316 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/PlistDiagnostics.cpp b/lib/Driver/PlistDiagnostics.cpp
index b9e35aa..7719930 100644
--- a/lib/Driver/PlistDiagnostics.cpp
+++ b/lib/Driver/PlistDiagnostics.cpp
@@ -55,7 +55,7 @@
llvm::SmallVectorImpl<unsigned>& V,
SourceManager& SM, SourceLocation L) {
- unsigned fid = SM.getCanonicalFileID(SM.getLogicalLoc(L));
+ unsigned fid = SM.getCanonicalFileID(SM.getInstantiationLoc(L));
FIDMap::iterator I = FIDs.find(fid);
if (I != FIDs.end()) return;
FIDs[fid] = V.size();
@@ -64,8 +64,7 @@
static unsigned GetFID(const FIDMap& FIDs,
SourceManager& SM, SourceLocation L) {
-
- unsigned fid = SM.getCanonicalFileID(SM.getLogicalLoc(L));
+ unsigned fid = SM.getCanonicalFileID(SM.getInstantiationLoc(L));
FIDMap::const_iterator I = FIDs.find(fid);
assert (I != FIDs.end());
return I->second;
@@ -82,9 +81,9 @@
Indent(o, indent) << "<dict>\n";
Indent(o, indent) << " <key>line</key><integer>"
- << SM.getLogicalLineNumber(L) << "</integer>\n";
+ << SM.getInstantiationLineNumber(L) << "</integer>\n";
Indent(o, indent) << " <key>col</key><integer>"
- << SM.getLogicalColumnNumber(L) << "</integer>\n";
+ << SM.getInstantiationColumnNumber(L) << "</integer>\n";
Indent(o, indent) << " <key>file</key><integer>"
<< GetFID(FM, SM, L) << "</integer>\n";
Indent(o, indent) << "</dict>\n";