Merge pull request #22595 from brentdax/taken-out-of-the-action

beccadax · web-flow · commit f944a544ae57 · 2019-02-13T17:15:33.000-08:00
[NFC] Remove vestigial IBActionAttr checks
diff --git a/lib/IRGen/GenObjC.cpp b/lib/IRGen/GenObjC.cpp
@@ -1415,7 +1415,7 @@ bool irgen::requiresObjCMethodDescriptor(FuncDecl *method) {
   if (isa<AccessorDecl>(method))
     return false;
 
-  return method->isObjC() || method->getAttrs().hasAttribute<IBActionAttr>();
+  return method->isObjC();
 }
 
 bool irgen::requiresObjCMethodDescriptor(ConstructorDecl *constructor) {
diff --git a/lib/SILGen/SILGenType.cpp b/lib/SILGen/SILGenType.cpp
@@ -159,7 +159,7 @@ bool SILGenModule::requiresObjCMethodEntryPoint(FuncDecl *method) {
   if (method->getAttrs().hasAttribute<NSManagedAttr>())
     return false;
 
-  return method->isObjC() || method->getAttrs().hasAttribute<IBActionAttr>();
+  return method->isObjC();
 }
 
 bool SILGenModule::requiresObjCMethodEntryPoint(ConstructorDecl *constructor) {

Original file line number	Diff line number	Diff line change
`@@ -1415,7 +1415,7 @@ bool irgen::requiresObjCMethodDescriptor(FuncDecl *method) {`
`1415`	`1415`	`if (isa<AccessorDecl>(method))`
`1416`	`1416`	`return false;`
`1417`	`1417`
`1418`		`- return method->isObjC() \|\| method->getAttrs().hasAttribute<IBActionAttr>();`
	`1418`	`+ return method->isObjC();`
`1419`	`1419`	`}`
`1420`	`1420`
`1421`	`1421`	`bool irgen::requiresObjCMethodDescriptor(ConstructorDecl *constructor) {`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ bool SILGenModule::requiresObjCMethodEntryPoint(FuncDecl *method) {`
`159`	`159`	`if (method->getAttrs().hasAttribute<NSManagedAttr>())`
`160`	`160`	`return false;`
`161`	`161`
`162`		`- return method->isObjC() \|\| method->getAttrs().hasAttribute<IBActionAttr>();`
	`162`	`+ return method->isObjC();`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`bool SILGenModule::requiresObjCMethodEntryPoint(ConstructorDecl *constructor) {`