diff options
| author | Steve Naroff <snaroff@apple.com> | 2009-07-10 23:34:53 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2009-07-10 23:34:53 +0000 |
| commit | 14108da7f7fc059772711e4ffee1322a27b152a7 (patch) | |
| tree | 5461a189505985c1c245c3f63a48030f0cd5e929 /lib/Frontend/PCHReader.cpp | |
| parent | 7ecbfbcddd278eede10bd38fa03a95a2110b191a (diff) | |
This patch includes a conceptually simple, but very intrusive/pervasive change.
The idea is to segregate Objective-C "object" pointers from general C pointers (utilizing the recently added ObjCObjectPointerType). The fun starts in Sema::GetTypeForDeclarator(), where "SomeInterface *" is now represented by a single AST node (rather than a PointerType whose Pointee is an ObjCInterfaceType). Since a significant amount of code assumed ObjC object pointers where based on C pointers/structs, this patch is very tedious. It should also explain why it is hard to accomplish this in smaller, self-contained patches.
This patch does most of the "heavy lifting" related to moving from PointerType->ObjCObjectPointerType. It doesn't include all potential "cleanups". The good news is additional cleanups can be done later (some are noted in the code). This patch is so large that I didn't want to include any changes that are purely aesthetic.
By making the ObjC types truly built-in, they are much easier to work with (and require fewer "hacks"). For example, there is no need for ASTContext::isObjCIdStructType() or ASTContext::isObjCClassStructType()! We believe this change (and the follow-up cleanups) will pay dividends over time.
Given the amount of code change, I do expect some fallout from this change (though it does pass all of the clang tests). If you notice any problems, please let us know asap! Thanks.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75314 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/PCHReader.cpp')
| -rw-r--r-- | lib/Frontend/PCHReader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index 47a7e6264a..c922b0d6db 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -1531,6 +1531,7 @@ void PCHReader::InitializeContext(ASTContext &Ctx) { Context->setObjCProtoType(GetType(Proto)); if (unsigned Class = SpecialTypes[pch::SPECIAL_TYPE_OBJC_CLASS]) Context->setObjCClassType(GetType(Class)); + if (unsigned String = SpecialTypes[pch::SPECIAL_TYPE_CF_CONSTANT_STRING]) Context->setCFConstantStringType(GetType(String)); if (unsigned FastEnum @@ -1934,13 +1935,12 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) { case pch::TYPE_OBJC_OBJECT_POINTER: { unsigned Idx = 0; - ObjCInterfaceDecl *ItfD = - cast_or_null<ObjCInterfaceDecl>(GetDecl(Record[Idx++])); + QualType OIT = GetType(Record[Idx++]); unsigned NumProtos = Record[Idx++]; llvm::SmallVector<ObjCProtocolDecl*, 4> Protos; for (unsigned I = 0; I != NumProtos; ++I) Protos.push_back(cast<ObjCProtocolDecl>(GetDecl(Record[Idx++]))); - return Context->getObjCObjectPointerType(ItfD, Protos.data(), NumProtos); + return Context->getObjCObjectPointerType(OIT, Protos.data(), NumProtos); } } // Suppress a GCC warning |