Substantially alter the design of the Objective C type AST by introducing
ObjCObjectType, which is basically just a pair of
one of {primitive-id, primitive-Class, user-defined @class}
with
a list of protocols.
An ObjCObjectPointerType is therefore just a pointer which always points to
one of these types (possibly sugared). ObjCInterfaceType is now just a kind
of ObjCObjectType which happens to not carry any protocols.
Alter a rather large number of use sites to use ObjCObjectType instead of
ObjCInterfaceType. Store an ObjCInterfaceType as a pointer on the decl rather
than hashing them in a FoldingSet. Remove some number of methods that are no
longer used, at least after this patch.
By simplifying ObjCObjectPointerType, we are now able to easily remove and apply
pointers to Objective-C types, which is crucial for a certain kind of ObjC++
metaprogramming common in WebKit.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103870 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Index/Analyzer.cpp b/lib/Index/Analyzer.cpp
index 1354fe6..6be35ab 100644
--- a/lib/Index/Analyzer.cpp
+++ b/lib/Index/Analyzer.cpp
@@ -180,7 +180,7 @@
if (IsInstanceMethod)
return false;
- MsgD = Msg->getClassReceiver()->getAs<ObjCInterfaceType>()->getDecl();
+ MsgD = Msg->getClassReceiver()->getAs<ObjCObjectType>()->getInterface();
break;
}
@@ -189,7 +189,7 @@
if (IsInstanceMethod)
return false;
- MsgD = Msg->getSuperType()->getAs<ObjCInterfaceType>()->getDecl();
+ MsgD = Msg->getSuperType()->getAs<ObjCObjectType>()->getInterface();
break;
case ObjCMessageExpr::SuperInstance:
@@ -292,12 +292,12 @@
case ObjCMessageExpr::Class:
CanBeClassMethod = true;
- MsgD = Msg->getClassReceiver()->getAs<ObjCInterfaceType>()->getDecl();
+ MsgD = Msg->getClassReceiver()->getAs<ObjCObjectType>()->getInterface();
break;
case ObjCMessageExpr::SuperClass:
CanBeClassMethod = true;
- MsgD = Msg->getSuperType()->getAs<ObjCInterfaceType>()->getDecl();
+ MsgD = Msg->getSuperType()->getAs<ObjCObjectType>()->getInterface();
break;
case ObjCMessageExpr::SuperInstance:
diff --git a/lib/Index/ResolveLocation.cpp b/lib/Index/ResolveLocation.cpp
index 4bb1594..8ef8f3b 100644
--- a/lib/Index/ResolveLocation.cpp
+++ b/lib/Index/ResolveLocation.cpp
@@ -130,7 +130,7 @@
ASTLocation VisitFunctionTypeLoc(FunctionTypeLoc TL);
ASTLocation VisitArrayTypeLoc(ArrayTypeLoc TL);
ASTLocation VisitObjCInterfaceTypeLoc(ObjCInterfaceTypeLoc TL);
- ASTLocation VisitObjCObjectPointerTypeLoc(ObjCObjectPointerTypeLoc TL);
+ ASTLocation VisitObjCObjectTypeLoc(ObjCObjectTypeLoc TL);
ASTLocation VisitTypeLoc(TypeLoc TL);
};
@@ -454,6 +454,13 @@
if (ContainsLocation(TL.getNameLoc()))
return ASTLocation(ParentDecl, TL.getIFaceDecl(), TL.getNameLoc());
+ return ASTLocation(ParentDecl, TL);
+}
+
+ASTLocation TypeLocResolver::VisitObjCObjectTypeLoc(ObjCObjectTypeLoc TL) {
+ assert(ContainsLocation(TL) &&
+ "Should visit only after verifying that loc is in range");
+
for (unsigned i = 0; i != TL.getNumProtocols(); ++i) {
SourceLocation L = TL.getProtocolLoc(i);
RangePos RP = CheckRange(L);
@@ -466,24 +473,6 @@
return ASTLocation(ParentDecl, TL);
}
-ASTLocation TypeLocResolver::VisitObjCObjectPointerTypeLoc(ObjCObjectPointerTypeLoc TL) {
- assert(ContainsLocation(TL) &&
- "Should visit only after verifying that loc is in range");
-
- if (TL.hasProtocolsAsWritten()) {
- for (unsigned i = 0; i != TL.getNumProtocols(); ++i) {
- SourceLocation L = TL.getProtocolLoc(i);
- RangePos RP = CheckRange(L);
- if (RP == AfterLoc)
- break;
- if (RP == ContainsLoc)
- return ASTLocation(ParentDecl, TL.getProtocol(i), L);
- }
- }
-
- return ASTLocation(ParentDecl, TL);
-}
-
ASTLocation TypeLocResolver::VisitTypeLoc(TypeLoc TL) {
assert(ContainsLocation(TL) &&
"Should visit only after verifying that loc is in range");