objc-gc: More sema work for properties declared 'weak'
in GC mode. // rdar://10073896
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@139235 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index 9695b81..9f50dea 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -594,12 +594,18 @@
ObjCPropertyDecl::PropertyAttributeKind kind
= property->getPropertyAttributes();
QualType PropType = Context.getCanonicalType(property->getType());
- bool PropertyIsGCWeak = (kind & ObjCPropertyDecl::OBJC_PR_weak &&
- !getLangOptions().ObjCAutoRefCount &&
- getLangOptions().getGCMode() !=
- LangOptions::NonGC);
- if (PropertyIsGCWeak && !PropType.isObjCGCStrong())
- PropType = Context.getObjCGCQualType(PropType, Qualifiers::Weak);
+
+ if ((kind & ObjCPropertyDecl::OBJC_PR_weak) &&
+ !getLangOptions().ObjCAutoRefCount &&
+ getLangOptions().getGCMode() != LangOptions::NonGC) {
+ if (PropType.isObjCGCStrong()) {
+ Diag(PropertyLoc,
+ diag::err_gc_weak_property_strong_type);
+ Diag(property->getLocation(), diag::note_property_declare);
+ }
+ else
+ PropType = Context.getObjCGCQualType(PropType, Qualifiers::Weak);
+ }
QualType PropertyIvarType = PropType;
if (PropType->isReferenceType())
PropertyIvarType = cast<ReferenceType>(PropType)->getPointeeType();
@@ -721,6 +727,7 @@
getLangOptions().getGCMode() != LangOptions::NonGC)) {
Diag(PropertyLoc, diag::error_weak_property)
<< property->getDeclName() << Ivar->getDeclName();
+ Diag(Ivar->getLocation(), diag::note_ivar_decl);
// Fall thru - see previous comment
}
// Fall thru - see previous comment