diff options
| author | John McCall <rjmccall@apple.com> | 2010-11-15 09:13:47 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-11-15 09:13:47 +0000 |
| commit | 8cb679e4e1e20345b2bb9276fd051b41a21e5e3d (patch) | |
| tree | 645a16ae7ee52a98f186e00b2bfb7c6334e64bfe /clang/lib/Sema/SemaObjCProperty.cpp | |
| parent | 14776cf96a510ca5550d728d9ff7d84f07773592 (diff) | |
| download | bcm5719-llvm-8cb679e4e1e20345b2bb9276fd051b41a21e5e3d.tar.gz bcm5719-llvm-8cb679e4e1e20345b2bb9276fd051b41a21e5e3d.zip | |
Assorted work leading towards the elimination of CK_Unknown.
llvm-svn: 119138
Diffstat (limited to 'clang/lib/Sema/SemaObjCProperty.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaObjCProperty.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index e1c0f4af99e..4c439f90e89 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/lib/Sema/SemaObjCProperty.cpp @@ -424,8 +424,11 @@ Decl *Sema::ActOnPropertyImplDecl(Scope *S, Context.canAssignObjCInterfaces( PropType->getAs<ObjCObjectPointerType>(), IvarType->getAs<ObjCObjectPointerType>()); - else - compat = (CheckAssignmentConstraints(PropType, IvarType) == Compatible); + else { + CastKind K = CK_Invalid; + compat = (CheckAssignmentConstraints(PropType, IvarType, K) + == Compatible); + } if (!compat) { Diag(PropertyLoc, diag::error_property_ivar_type) << property->getDeclName() << PropType @@ -644,9 +647,11 @@ bool Sema::DiagnosePropertyAccessorMismatch(ObjCPropertyDecl *property, if (GetterMethod && GetterMethod->getResultType() != property->getType()) { AssignConvertType result = Incompatible; - if (property->getType()->isObjCObjectPointerType()) + if (property->getType()->isObjCObjectPointerType()) { + CastKind Kind = CK_Invalid; result = CheckAssignmentConstraints(GetterMethod->getResultType(), - property->getType()); + property->getType(), Kind); + } if (result != Compatible) { Diag(Loc, diag::warn_accessor_property_type_mismatch) << property->getDeclName() |
