[cfe-commits] r137366 - in /cfe/trunk/lib/Serialization: ASTReader.cpp ASTWriter.cpp

[Douglas Gregor]

Author: dgregor
Date: Thu Aug 11 17:04:35 2011
New Revision: 137366

URL: http://llvm.org/viewvc/llvm-project?rev=137366&view=rev
Log:
The AST reader and writer don't need accessors for poking at the predefined Objective-C types

Modified:
    cfe/trunk/lib/Serialization/ASTReader.cpp
    cfe/trunk/lib/Serialization/ASTWriter.cpp

Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=137366&r1=137365&r2=137366&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Thu Aug 11 17:04:35 2011
@@ -2966,13 +2966,13 @@
     Context->setBuiltinVaListType(
       GetType(SpecialTypes[SPECIAL_TYPE_BUILTIN_VA_LIST]));
     if (unsigned Id = SpecialTypes[SPECIAL_TYPE_OBJC_ID])
-      Context->setObjCIdType(GetType(Id));
+      Context->ObjCIdTypedefType = GetType(Id);
     if (unsigned Sel = SpecialTypes[SPECIAL_TYPE_OBJC_SELECTOR])
-      Context->setObjCSelType(GetType(Sel));
+      Context->ObjCSelTypedefType = GetType(Sel);
     if (unsigned Proto = SpecialTypes[SPECIAL_TYPE_OBJC_PROTOCOL])
-      Context->setObjCProtoType(GetType(Proto));
+      Context->ObjCProtoType = GetType(Proto);
     if (unsigned Class = SpecialTypes[SPECIAL_TYPE_OBJC_CLASS])
-      Context->setObjCClassType(GetType(Class));
+      Context->ObjCClassTypedefType = GetType(Class);
 
     if (unsigned String = SpecialTypes[SPECIAL_TYPE_CF_CONSTANT_STRING])
       Context->setCFConstantStringType(GetType(String));

Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=137366&r1=137365&r2=137366&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTWriter.cpp Thu Aug 11 17:04:35 2011
@@ -2929,10 +2929,10 @@
   // Form the record of special types.
   RecordData SpecialTypes;
   AddTypeRef(Context.getBuiltinVaListType(), SpecialTypes);
-  AddTypeRef(Context.getObjCIdType(), SpecialTypes);
-  AddTypeRef(Context.getObjCSelType(), SpecialTypes);
-  AddTypeRef(Context.getObjCProtoType(), SpecialTypes);
-  AddTypeRef(Context.getObjCClassType(), SpecialTypes);
+  AddTypeRef(Context.ObjCIdTypedefType, SpecialTypes);
+  AddTypeRef(Context.ObjCSelTypedefType, SpecialTypes);
+  AddTypeRef(Context.ObjCProtoType, SpecialTypes);
+  AddTypeRef(Context.ObjCClassTypedefType, SpecialTypes);
   AddTypeRef(Context.getRawCFConstantStringType(), SpecialTypes);
   AddTypeRef(Context.getFILEType(), SpecialTypes);
   AddTypeRef(Context.getjmp_bufType(), SpecialTypes);