diff options
| -rw-r--r-- | clang/lib/AST/ASTContext.cpp | 24 | ||||
| -rw-r--r-- | clang/test/SemaObjC/objc2-merge-gc-attribue-decl.m | 3 |
2 files changed, 22 insertions, 5 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index a4b9acc110d..28325edbd40 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -3028,6 +3028,20 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { if (LHSClass == Type::FunctionProto) LHSClass = Type::FunctionNoProto; if (RHSClass == Type::FunctionProto) RHSClass = Type::FunctionNoProto; + QualType::GCAttrTypes RHSGCAttr = QualType::GCNone; + QualType::GCAttrTypes LHSGCAttr = QualType::GCNone; + if (RHSClass == Type::ExtQual) { + RHSGCAttr = RHSCan.getObjCGCAttr(); + if (RHSGCAttr != QualType::GCNone) + RHSClass = RHSCan.getUnqualifiedType()->getTypeClass(); + } + + if (LHSClass == Type::ExtQual) { + LHSGCAttr = LHSCan.getObjCGCAttr(); + if (LHSGCAttr != QualType::GCNone) + LHSClass = LHSCan.getUnqualifiedType()->getTypeClass(); + } + // Same as above for arrays if (LHSClass == Type::VariableArray || LHSClass == Type::IncompleteArray) LHSClass = Type::ConstantArray; @@ -3125,10 +3139,16 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { QualType RHSPointee = RHS->getAsPointerType()->getPointeeType(); QualType ResultType = mergeTypes(LHSPointee, RHSPointee); if (ResultType.isNull()) return QualType(); - if (getCanonicalType(LHSPointee) == getCanonicalType(ResultType)) + if (getCanonicalType(LHSPointee) == getCanonicalType(ResultType)) { + if (RHSGCAttr != LHSGCAttr && RHSGCAttr != QualType::GCNone) + LHS = getObjCGCQualType(LHS, RHSGCAttr); return LHS; - if (getCanonicalType(RHSPointee) == getCanonicalType(ResultType)) + } + if (getCanonicalType(RHSPointee) == getCanonicalType(ResultType)) { + if (RHSGCAttr != LHSGCAttr && LHSGCAttr != QualType::GCNone) + RHS = getObjCGCQualType(RHS, LHSGCAttr); return RHS; + } return getPointerType(ResultType); } case Type::BlockPointer: diff --git a/clang/test/SemaObjC/objc2-merge-gc-attribue-decl.m b/clang/test/SemaObjC/objc2-merge-gc-attribue-decl.m index 452d0cf3344..0b483834226 100644 --- a/clang/test/SemaObjC/objc2-merge-gc-attribue-decl.m +++ b/clang/test/SemaObjC/objc2-merge-gc-attribue-decl.m @@ -1,7 +1,4 @@ // RUN: clang-cc -triple i386-apple-darwin9 -fobjc-gc -fsyntax-only -verify %s -// This is really dangerous! Disabling for now until we work out what's -// supposed to happen here. -// XFAIL @interface INTF @end extern INTF* p2; |
