diff options
Diffstat (limited to 'lib/AST/ASTContext.cpp')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 44 |
1 files changed, 35 insertions, 9 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 29bca29..3b40526 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -2785,7 +2785,7 @@ QualType::GCAttrTypes ASTContext::getObjCGCAttrKind(const QualType &Ty) const { } // Non-pointers have none gc'able attribute regardless of the attribute // set on them. - else if (!isObjCObjectPointerType(Ty) && !Ty->isPointerType()) + else if (!Ty->isPointerType() && !isObjCObjectPointerType(Ty)) return QualType::GCNone; } return GCAttrs; @@ -3033,26 +3033,52 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { if (RHSClass == Type::ExtQual) { QualType::GCAttrTypes GCAttr = RHSCan.getObjCGCAttr(); if (GCAttr != QualType::GCNone) { + QualType::GCAttrTypes GCLHSAttr = LHSCan.getObjCGCAttr(); + // __weak attribute must appear on both declarations. + // __strong attribue is redundant if other decl is an objective-c + // object pointer (or decorated with __strong attribute); otherwise + // issue error. + if ((GCAttr == QualType::Weak && GCLHSAttr != GCAttr) || + (GCAttr == QualType::Strong && GCLHSAttr != GCAttr && + LHSCan->isPointerType() && !isObjCObjectPointerType(LHSCan) && + !isObjCIdStructType(LHSCan->getAsPointerType()->getPointeeType()))) + return QualType(); + RHS = QualType(cast<ExtQualType>(RHS.getDesugaredType())->getBaseType(), RHS.getCVRQualifiers()); QualType Result = mergeTypes(LHS, RHS); - if (Result.getObjCGCAttr() == QualType::GCNone) - Result = getObjCGCQualType(Result, GCAttr); - else if (Result.getObjCGCAttr() != GCAttr) - Result = QualType(); + if (!Result.isNull()) { + if (Result.getObjCGCAttr() == QualType::GCNone) + Result = getObjCGCQualType(Result, GCAttr); + else if (Result.getObjCGCAttr() != GCAttr) + Result = QualType(); + } return Result; } } if (LHSClass == Type::ExtQual) { QualType::GCAttrTypes GCAttr = LHSCan.getObjCGCAttr(); if (GCAttr != QualType::GCNone) { + QualType::GCAttrTypes GCRHSAttr = RHSCan.getObjCGCAttr(); + // __weak attribute must appear on both declarations. __strong + // __strong attribue is redundant if other decl is an objective-c + // object pointer (or decorated with __strong attribute); otherwise + // issue error. + if ((GCAttr == QualType::Weak && GCRHSAttr != GCAttr) || + (GCAttr == QualType::Strong && GCRHSAttr != GCAttr && + RHSCan->isPointerType() && !isObjCObjectPointerType(RHSCan) && + !isObjCIdStructType(RHSCan->getAsPointerType()->getPointeeType()))) + return QualType(); + LHS = QualType(cast<ExtQualType>(LHS.getDesugaredType())->getBaseType(), LHS.getCVRQualifiers()); QualType Result = mergeTypes(LHS, RHS); - if (Result.getObjCGCAttr() == QualType::GCNone) - Result = getObjCGCQualType(Result, GCAttr); - else if (Result.getObjCGCAttr() != GCAttr) - Result = QualType(); + if (!Result.isNull()) { + if (Result.getObjCGCAttr() == QualType::GCNone) + Result = getObjCGCQualType(Result, GCAttr); + else if (Result.getObjCGCAttr() != GCAttr) + Result = QualType(); + } return Result; } } |
