commit 74f6701b77493fb60c98ac036e8a24eddaa6219b
author Chris Lattner <sabre@nondot.org> Fri Jan 16 07:15:35 2009 +0000
committer Chris Lattner <sabre@nondot.org> Fri Jan 16 07:15:35 2009 +0000
tree 19693f2190bb2839f179e07560f1b16ce229b19f
parent fd5f14340189da032be0af550199c039c8709ff3

rename "virtual location" of a macro to "instantiation location".


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62315 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/ASTContext.cpp

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index c64c101..fe868d0 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -2488,6 +2488,7 @@
 //===----------------------------------------------------------------------===//
 //                         Integer Predicates
 //===----------------------------------------------------------------------===//
+
 unsigned ASTContext::getIntWidth(QualType T) {
   if (T == BoolTy)
     return 1;

lib/Basic/SourceManager.cpp

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index 719d29a..55e8c4a 100644
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -166,7 +166,7 @@
     
     // The instanitation point and source SpellingLoc have to exactly match to
     // reuse (for now).  We could allow "nearby" instantiations in the future.
-    if (LastOne.getVirtualLoc() != InstantLoc ||
+    if (LastOne.getInstantiationLoc() != InstantLoc ||
         LastOne.getSpellingLoc().getFileID() != SpellingLoc.getFileID())
       continue;
   
@@ -480,13 +480,13 @@
 }
 
 void MacroIDInfo::Emit(llvm::Serializer& S) const {
-  S.Emit(VirtualLoc);
+  S.Emit(InstantiationLoc);
   S.Emit(SpellingLoc);
 }
 
 MacroIDInfo MacroIDInfo::ReadVal(llvm::Deserializer& D) {
   MacroIDInfo I;
-  I.VirtualLoc = SourceLocation::ReadVal(D);
+  I.InstantiationLoc = SourceLocation::ReadVal(D);
   I.SpellingLoc = SourceLocation::ReadVal(D);
   return I;
 }