Treat access note @objc as ineligible for @nonobjc

beccadax · beccadax · commit b4056c8aaefe · 2021-03-24T14:55:06.000-07:00
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -5271,7 +5271,7 @@ canSuppressPotentialWitnessWarningWithNonObjC(ValueDecl *requirement,
 
   // ... but not explicitly.
   if (auto attr = witness->getAttrs().getAttribute<ObjCAttr>()) {
-    if (!attr->isImplicit()) return false;
+    if (!attr->isImplicit() || attr->getAddedByAccessNote()) return false;
   }
 
   // And not because it has to be for overriding.

Original file line number	Diff line number	Diff line change
`@@ -5271,7 +5271,7 @@ canSuppressPotentialWitnessWarningWithNonObjC(ValueDecl *requirement,`
`5271`	`5271`
`5272`	`5272`	`// ... but not explicitly.`
`5273`	`5273`	`if (auto attr = witness->getAttrs().getAttribute<ObjCAttr>()) {`
`5274`		`- if (!attr->isImplicit()) return false;`
	`5274`	`+ if (!attr->isImplicit() \|\| attr->getAddedByAccessNote()) return false;`
`5275`	`5275`	`}`
`5276`	`5276`
`5277`	`5277`	`// And not because it has to be for overriding.`