diff --git a/clang/Lex/PPExpressions.cpp b/clang/Lex/PPExpressions.cpp
index 2a18cfd610251b218afcf0a97edd1f056999c0f7..fb745068fdf8cc183f91ed9837633e0d365c1093 100644
--- a/clang/Lex/PPExpressions.cpp
+++ b/clang/Lex/PPExpressions.cpp
@@ -100,17 +100,18 @@ static bool EvaluateValue(llvm::APSInt &Result, Token &PeekTok,
     }
     
     // Otherwise, we got an identifier, is it defined to something?
-    Result = II->getMacroInfo() != 0;
+    Result = II->hasMacroDefinition();
     Result.setIsUnsigned(false);  // Result is signed intmax_t.
 
     // If there is a macro, mark it used.
     if (Result != 0 && ValueLive) {
-      II->getMacroInfo()->setIsUsed(true);
+      MacroInfo *Macro = II->getMacroInfo();
+      Macro->setIsUsed(true);
       
       // If this is the first use of a target-specific macro, warn about it.
-      if (II->getMacroInfo()->isTargetSpecific()) {
+      if (Macro->isTargetSpecific()) {
         // Don't warn on second use.
-        II->getMacroInfo()->setIsTargetSpecific(false);
+        Macro->setIsTargetSpecific(false);
         PP.getTargetInfo().DiagnoseNonPortability(PeekTok.getLocation(),
                                                   diag::port_target_macro_use);
       }
diff --git a/clang/Lex/Pragma.cpp b/clang/Lex/Pragma.cpp
index 4d90e31c643d50897551a1dba34f04f63ed154dc..89725ae8e9f4f15662e308de7e9d894c8f449f0e 100644
--- a/clang/Lex/Pragma.cpp
+++ b/clang/Lex/Pragma.cpp
@@ -210,7 +210,7 @@ void Preprocessor::HandlePragmaPoison(Token &PoisonTok) {
     if (II->isPoisoned()) continue;
     
     // If this is a macro identifier, emit a warning.
-    if (II->getMacroInfo())
+    if (II->hasMacroDefinition())
       Diag(Tok, diag::pp_poisoning_existing_macro);
     
     // Finally, poison it!
diff --git a/clang/Lex/Preprocessor.cpp b/clang/Lex/Preprocessor.cpp
index f43eae1c9823e15d88f42ae0e075e258ab446cd8..2d53fe7915bd8e730169b453a45430ff281a85e2 100644
--- a/clang/Lex/Preprocessor.cpp
+++ b/clang/Lex/Preprocessor.cpp
@@ -533,7 +533,7 @@ static bool isTrivialSingleTokenExpansion(const MacroInfo *MI,
   
   // If the identifier is a macro, and if that macro is enabled, it may be
   // expanded so it's not a trivial expansion.
-  if (II->getMacroInfo() && II->getMacroInfo()->isEnabled() &&
+  if (II->hasMacroDefinition() && II->getMacroInfo()->isEnabled() &&
       // Fast expanding "#define X X" is ok, because X would be disabled.
       II != MacroIdent)
     return false;
@@ -1116,7 +1116,7 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
     for (IdentifierTable::iterator I = Identifiers.begin(),
          E = Identifiers.end(); I != E; ++I) {
       const IdentifierInfo &II = I->getValue();
-      if (II.getMacroInfo() && !II.getMacroInfo()->isUsed())
+      if (II.hasMacroDefinition() && !II.getMacroInfo()->isUsed())
         Diag(II.getMacroInfo()->getDefinitionLoc(), diag::pp_macro_not_used);
     }
   }
@@ -1188,7 +1188,7 @@ void Preprocessor::ReadMacroName(Token &MacroNameTok, char isDefineUndef) {
   } else if (isDefineUndef && II->getPPKeywordID() == tok::pp_defined) {
     // Error if defining "defined": C99 6.10.8.4.
     Diag(MacroNameTok, diag::err_defined_macro_name);
-  } else if (isDefineUndef && II->getMacroInfo() &&
+  } else if (isDefineUndef && II->hasMacroDefinition() &&
              II->getMacroInfo()->isBuiltinMacro()) {
     // Error if defining "__LINE__" and other builtins: C99 6.10.8.4.
     if (isDefineUndef == 1)