obj-c++: allow the getter/setter to return/take parameters
by reference. // rdar://10188258
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142075 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 170097c..60f8418 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -7264,13 +7264,14 @@
return;
}
}
- } else if (getLangOptions().ObjCAutoRefCount) {
+ } else {
const ObjCMethodDecl *setter
= PropRef->getExplicitProperty()->getSetterMethodDecl();
if (setter) {
ObjCMethodDecl::param_const_iterator P = setter->param_begin();
LHSTy = (*P)->getType();
- Consumed = (*P)->hasAttr<NSConsumedAttr>();
+ if (getLangOptions().ObjCAutoRefCount)
+ Consumed = (*P)->hasAttr<NSConsumedAttr>();
}
}
@@ -7285,6 +7286,7 @@
checkRetainCycles(const_cast<Expr*>(PropRef->getBase()), RHS.get());
}
}
+ LHSTy = LHSTy.getNonReferenceType();
}
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index 751f553..d35c010 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -948,7 +948,8 @@
ObjCMethodDecl *GetterMethod,
SourceLocation Loc) {
if (GetterMethod &&
- GetterMethod->getResultType() != property->getType()) {
+ GetterMethod->getResultType().getNonReferenceType()
+ != property->getType().getNonReferenceType()) {
AssignConvertType result = Incompatible;
if (property->getType()->isObjCObjectPointerType())
result = CheckAssignmentConstraints(Loc, GetterMethod->getResultType(),
@@ -1510,7 +1511,8 @@
Diag(SetterMethod->getLocation(), diag::err_setter_type_void);
if (SetterMethod->param_size() != 1 ||
!Context.hasSameUnqualifiedType(
- (*SetterMethod->param_begin())->getType(), property->getType())) {
+ (*SetterMethod->param_begin())->getType().getNonReferenceType(),
+ property->getType().getNonReferenceType())) {
Diag(property->getLocation(),
diag::warn_accessor_property_type_mismatch)
<< property->getDeclName()