From ef7564db25dffdea8703e67008ce11862ab3dfbd Mon Sep 17 00:00:00 2001 From: John McCall Date: Thu, 12 Nov 2015 23:39:39 +0000 Subject: [PATCH] Remove -Wobjc-weak-compat; there isn't a compelling use case for this. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252971 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.td | 3 -- lib/Sema/SemaType.cpp | 28 +++++++++---------- test/SemaObjC/property-in-class-extension-1.m | 4 +-- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 81a1f4a849..76730e6fc7 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -4561,9 +4561,6 @@ def err_synthesizing_arc_weak_property_disabled : Error< def err_synthesizing_arc_weak_property_no_runtime : Error< "cannot synthesize weak property because the current deployment target " "does not support weak references">; -def warn_objc_weak_compat : Warning< - "the meaning of __weak has changed in manual reference-counting">, - InGroup>, DefaultIgnore; def err_arc_unsupported_weak_class : Error< "class is incompatible with __weak references">; def err_arc_weak_unavailable_assign : Error< diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index bbd0c3fbd0..b6bc159428 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -5187,6 +5187,18 @@ static bool handleObjCOwnershipTypeAttr(TypeProcessingState &state, type = S.Context.getAttributedType(AttributedType::attr_objc_ownership, origType, type); + auto diagnoseOrDelay = [](Sema &S, SourceLocation loc, + unsigned diagnostic, QualType type) { + if (S.DelayedDiagnostics.shouldDelayDiagnostics()) { + S.DelayedDiagnostics.add( + sema::DelayedDiagnostic::makeForbiddenType( + S.getSourceManager().getExpansionLoc(loc), + diagnostic, type, /*ignored*/ 0)); + } else { + S.Diag(loc, diagnostic); + } + }; + // Sometimes, __weak isn't allowed. if (lifetime == Qualifiers::OCL_Weak && !S.getLangOpts().ObjCWeak && !NonObjCPointer) { @@ -5197,26 +5209,12 @@ static bool handleObjCOwnershipTypeAttr(TypeProcessingState &state, : diag::err_arc_weak_no_runtime); // In any case, delay the diagnostic until we know what we're parsing. - if (S.DelayedDiagnostics.shouldDelayDiagnostics()) { - S.DelayedDiagnostics.add( - sema::DelayedDiagnostic::makeForbiddenType( - S.getSourceManager().getExpansionLoc(AttrLoc), - diagnostic, type, /*ignored*/ 0)); - } else { - S.Diag(AttrLoc, diagnostic); - } + diagnoseOrDelay(S, AttrLoc, diagnostic, type); attr.setInvalid(); return true; } - // If we accepted __weak, we might still need to warn about it. - if (lifetime == Qualifiers::OCL_Weak && - !S.getLangOpts().ObjCAutoRefCount && - S.getLangOpts().ObjCWeak) { - S.Diag(AttrLoc, diag::warn_objc_weak_compat); - } - // Forbid __weak for class objects marked as // objc_arc_weak_reference_unavailable if (lifetime == Qualifiers::OCL_Weak) { diff --git a/test/SemaObjC/property-in-class-extension-1.m b/test/SemaObjC/property-in-class-extension-1.m index 8f5907b54d..b25639cf06 100644 --- a/test/SemaObjC/property-in-class-extension-1.m +++ b/test/SemaObjC/property-in-class-extension-1.m @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -fsyntax-only -triple x86_64-apple-darwin11 -fobjc-runtime-has-weak -fobjc-weak -verify -Weverything -Wno-objc-weak-compat %s -// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin11 -fobjc-runtime-has-weak -fobjc-weak -fsyntax-only -verify -Weverything -Wno-objc-weak-compat %s +// RUN: %clang_cc1 -fsyntax-only -triple x86_64-apple-darwin11 -fobjc-runtime-has-weak -fobjc-weak -verify -Weverything %s +// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin11 -fobjc-runtime-has-weak -fobjc-weak -fsyntax-only -verify -Weverything %s // rdar://12103400 @class NSString; -- 2.40.0