diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index e650993..8f0387e 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -27,8 +27,7 @@
 
 IdentifierInfo::IdentifierInfo() {
   TokenID = tok::identifier;
-  ObjCID = tok::objc_not_keyword;
-  BuiltinID = 0;
+  ObjCOrBuiltinID = 0;
   HasMacro = false;
   IsExtension = false;
   IsPoisoned = false;