[WIP] Avoid invalidating @_objcImplementation

beccadax · beccadax · commit 60d73ccd69d4 · 2024-09-04T17:12:57.000-07:00
rdar://134730183
diff --git a/lib/Sema/TypeCheckDeclObjC.cpp b/lib/Sema/TypeCheckDeclObjC.cpp
@@ -153,7 +153,7 @@ void ObjCReason::describe(const Decl *D) const {
 }
 
 void ObjCReason::setAttrInvalid() const {
-  if (requiresAttr(kind))
+  if (shouldInvalidateAttr(kind))
     getAttr()->setInvalid();
 }
 
diff --git a/lib/Sema/TypeCheckObjC.h b/lib/Sema/TypeCheckObjC.h
@@ -127,6 +127,14 @@ class ObjCReason {
     }
   }
 
+  /// If the declaration cannot be made \c @objc , should we invalidate the
+  /// attribute?
+  static bool shouldInvalidateAttr(Kind kind) {
+    if (kind == MemberOfObjCImplementationExtension)
+      return false;
+    return requiresAttr(kind);
+  }
+
 public:
   /// Implicit conversion from the trivial reason kinds.
   ObjCReason(Kind kind) : kind(kind) {

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void ObjCReason::describe(const Decl *D) const {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`void ObjCReason::setAttrInvalid() const {`
`156`		`- if (requiresAttr(kind))`
	`156`	`+ if (shouldInvalidateAttr(kind))`
`157`	`157`	`getAttr()->setInvalid();`
`158`	`158`	`}`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,14 @@ class ObjCReason {`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ /// If the declaration cannot be made \c @objc , should we invalidate the`
	`131`	`+ /// attribute?`
	`132`	`+ static bool shouldInvalidateAttr(Kind kind) {`
	`133`	`+ if (kind == MemberOfObjCImplementationExtension)`
	`134`	`+ return false;`
	`135`	`+ return requiresAttr(kind);`
	`136`	`+ }`
	`137`	`+`
`130`	`138`	`public:`
`131`	`139`	`/// Implicit conversion from the trivial reason kinds.`
`132`	`140`	`ObjCReason(Kind kind) : kind(kind) {`