---

swift-ci · swift-ci · commit f5b4d2adda05 · 2019-02-13T17:29:37.000-08:00
yaml --- r: 346837 b: refs/heads/master c: a364df0 h: refs/heads/master i: 346835: 138f5b8
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1a95cfe3550580bd8eb86c29bd2cae9881d1f580
+refs/heads/master: a364df029cc733dff8dbe32e431eecc15e8101a8
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
diff --git a/trunk/lib/IRGen/GenObjC.cpp b/trunk/lib/IRGen/GenObjC.cpp
@@ -1381,7 +1381,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/trunk/lib/SILGen/SILGenType.cpp b/trunk/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
`@@ -1381,7 +1381,7 @@ bool irgen::requiresObjCMethodDescriptor(FuncDecl *method) {`
`1381`	`1381`	`if (isa<AccessorDecl>(method))`
`1382`	`1382`	`return false;`
`1383`	`1383`
`1384`		`- return method->isObjC() \|\| method->getAttrs().hasAttribute<IBActionAttr>();`
	`1384`	`+ return method->isObjC();`
`1385`	`1385`	`}`
`1386`	`1386`
`1387`	`1387`	`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) {`