diff options
| author | John McCall <rjmccall@apple.com> | 2011-10-25 17:37:35 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-10-25 17:37:35 +0000 |
| commit | 3c3b7f90a863af43fa63043d396553ecf205351c (patch) | |
| tree | 0bf73812c898572adb7e3f2e6ebbe2d62f60612d /lib/Sema/SemaObjCProperty.cpp | |
| parent | edae1a2fc81982b87207cd0b385ee7a9c8ce426b (diff) | |
Restore r142914 and r142915, now with missing file and apparent
GCC compiler workaround.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142931 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaObjCProperty.cpp')
| -rw-r--r-- | lib/Sema/SemaObjCProperty.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp index 7e9bb46cd6..617dbefada 100644 --- a/lib/Sema/SemaObjCProperty.cpp +++ b/lib/Sema/SemaObjCProperty.cpp @@ -800,9 +800,7 @@ Decl *Sema::ActOnPropertyImplDecl(Scope *S, SelfExpr, true, true); ObjCMethodDecl::param_iterator P = setterMethod->param_begin(); ParmVarDecl *Param = (*P); - QualType T = Param->getType(); - if (T->isReferenceType()) - T = T->getAs<ReferenceType>()->getPointeeType(); + QualType T = Param->getType().getNonReferenceType(); Expr *rhs = new (Context) DeclRefExpr(Param, T, VK_LValue, SourceLocation()); ExprResult Res = BuildBinOp(S, lhs->getLocEnd(), @@ -954,8 +952,8 @@ bool Sema::DiagnosePropertyAccessorMismatch(ObjCPropertyDecl *property, ObjCMethodDecl *GetterMethod, SourceLocation Loc) { if (GetterMethod && - GetterMethod->getResultType().getNonReferenceType() - != property->getType().getNonReferenceType()) { + !Context.hasSameType(GetterMethod->getResultType().getNonReferenceType(), + property->getType().getNonReferenceType())) { AssignConvertType result = Incompatible; if (property->getType()->isObjCObjectPointerType()) result = CheckAssignmentConstraints(Loc, GetterMethod->getResultType(), |