Revert http://llvm.org/viewvc/llvm-project?view=rev&revision=65244.
Remove support for "Class<P>". Will be making this an error.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65332 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 78f2a8a..60d8b8b 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -1397,29 +1397,6 @@
return QualType(QType, 0);
}
-/// getObjCQualifiedClassType - Return an ObjCQualifiedIdType for the 'Class'
-/// decl and the conforming protocol list.
-QualType ASTContext::getObjCQualifiedClassType(ObjCProtocolDecl **Protocols,
- unsigned NumProtocols) {
- // Sort the protocol list alphabetically to canonicalize it.
- SortAndUniqueProtocols(Protocols, NumProtocols);
-
- llvm::FoldingSetNodeID ID;
- ObjCQualifiedIdType::Profile(ID, Protocols, NumProtocols);
-
- void *InsertPos = 0;
- if (ObjCQualifiedClassType *QT =
- ObjCQualifiedClassTypes.FindNodeOrInsertPos(ID, InsertPos))
- return QualType(QT, 0);
-
- // No Match;
- ObjCQualifiedClassType *QType =
- new (*this,8) ObjCQualifiedClassType(Protocols, NumProtocols);
- Types.push_back(QType);
- ObjCQualifiedClassTypes.InsertNode(QType, InsertPos);
- return QualType(QType, 0);
-}
-
/// getTypeOfExpr - Unlike many "get<Type>" functions, we can't unique
/// TypeOfExpr AST's (since expression's are never shared). For example,
/// multiple declarations that refer to "typeof(x)" all contain different
@@ -2422,7 +2399,7 @@
/// to struct), Interface* (pointer to ObjCInterfaceType) and id<P> (qualified
/// ID type).
bool ASTContext::isObjCObjectPointerType(QualType Ty) const {
- if (Ty->isObjCQualifiedIdType() || Ty->isObjCQualifiedClassType())
+ if (Ty->isObjCQualifiedIdType())
return true;
// Blocks are objects.
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index d868cba..bfba598 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -285,8 +285,7 @@
static bool HasPointerEvalType(const Expr* E) {
return E->getType()->isPointerType()
|| E->getType()->isBlockPointerType()
- || E->getType()->isObjCQualifiedIdType()
- || E->getType()->isObjCQualifiedClassType();
+ || E->getType()->isObjCQualifiedIdType();
}
static bool EvaluatePointer(const Expr* E, APValue& Result, EvalInfo &Info) {
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 065b626..7b07b9c 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -870,17 +870,6 @@
Profile(ID, &Protocols[0], getNumProtocols());
}
-void ObjCQualifiedClassType::Profile(llvm::FoldingSetNodeID &ID,
- ObjCProtocolDecl **protocols,
- unsigned NumProtocols) {
- for (unsigned i = 0; i != NumProtocols; i++)
- ID.AddPointer(protocols[i]);
-}
-
-void ObjCQualifiedClassType::Profile(llvm::FoldingSetNodeID &ID) {
- Profile(ID, &Protocols[0], getNumProtocols());
-}
-
/// LookThroughTypedefs - Return the ultimate type this typedef corresponds to
/// potentially looking through *all* consequtive typedefs. This returns the
/// sum of the type qualifiers, so if you have:
@@ -1357,22 +1346,6 @@
InnerString = ObjCQIString + InnerString;
}
-void ObjCQualifiedClassType::getAsStringInternal(std::string &InnerString) const
-{
- if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'.
- InnerString = ' ' + InnerString;
- std::string ObjCQIString = "Class";
- ObjCQIString += '<';
- int num = getNumProtocols();
- for (int i = 0; i < num; i++) {
- ObjCQIString += getProtocols(i)->getNameAsString();
- if (i < num-1)
- ObjCQIString += ',';
- }
- ObjCQIString += '>';
- InnerString = ObjCQIString + InnerString;
-}
-
void TagType::getAsStringInternal(std::string &InnerString) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'.
InnerString = ' ' + InnerString;
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index b17f7bc..aef6661 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -2736,7 +2736,6 @@
// a null pointer constant.
if ((lhsType->isPointerType() ||
lhsType->isObjCQualifiedIdType() ||
- lhsType->isObjCQualifiedClassType() ||
lhsType->isBlockPointerType())
&& rExpr->isNullPointerConstant(Context)) {
ImpCastExprToType(rExpr, lhsType);
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 6975241..acdeec6 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -151,10 +151,6 @@
// id<protocol-list>
Result = Context.getObjCQualifiedIdType((ObjCProtocolDecl**)PQ,
DS.getNumProtocolQualifiers());
- else if (Result == Context.getObjCClassType())
- // Support the following GCC extension: Class<protocol-list>
- Result = Context.getObjCQualifiedClassType((ObjCProtocolDecl**)PQ,
- DS.getNumProtocolQualifiers());
else
Diag(DS.getSourceRange().getBegin(),
diag::warn_ignoring_objc_qualifiers) << DS.getSourceRange();