diff options
Diffstat (limited to 'lib/AST')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 4 | ||||
| -rw-r--r-- | lib/AST/Type.cpp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 02bedcaf78..1e553e3aba 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -431,7 +431,6 @@ ASTContext::getTypeInfo(const Type *T) { // alignment requirements: getPointerInfo should take an AddrSpace. return getTypeInfo(QualType(cast<ExtQualType>(T)->getBaseType(), 0)); case Type::ObjCQualifiedId: - case Type::ObjCQualifiedClass: case Type::ObjCQualifiedInterface: Width = Target.getPointerWidth(0); Align = Target.getPointerAlign(0); @@ -3136,9 +3135,6 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { case Type::FixedWidthInt: // Distinct fixed-width integers are not compatible. return QualType(); - case Type::ObjCQualifiedClass: - // Distinct qualified classes are not compatible. - return QualType(); case Type::ExtQual: // FIXME: ExtQual types can be compatible even if they're not // identical! diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index 97245c699a..7daa20704b 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -768,8 +768,7 @@ bool Type::isScalarType() const { isa<BlockPointerType>(CanonicalType) || isa<MemberPointerType>(CanonicalType) || isa<ComplexType>(CanonicalType) || - isa<ObjCQualifiedIdType>(CanonicalType) || - isa<ObjCQualifiedClassType>(CanonicalType); + isa<ObjCQualifiedIdType>(CanonicalType); } /// \brief Determines whether the type is a C++ aggregate type or C |