2 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index c64c1010bee..fe868d07683 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -2488,6 +2488,7 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) {
 //===----------------------------------------------------------------------===//
 //                         Integer Predicates
 //===----------------------------------------------------------------------===//
+
 unsigned ASTContext::getIntWidth(QualType T) {
   if (T == BoolTy)
     return 1;
diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp
index 719d29aa795..55e8c4aee78 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -166,7 +166,7 @@ SourceLocation SourceManager::getInstantiationLoc(SourceLocation SpellingLoc,
     
     // 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 @@ FileIDInfo FileIDInfo::ReadVal(llvm::Deserializer& D) {
 }
 
 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;
 }