Merge pull request #4413 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

lib/LLVMPasses/LLVMMergeFunctions.cpp

@@ -120,9 +120,16 @@ static bool isCalleeOperand(const CallInst *CI, unsigned opIdx) {
 static bool canParameterizeCallOperand(const CallInst *CI, unsigned opIdx) {
   if (CI->isInlineAsm())
     return false;
-  if (Function *Callee = CI->getCalledFunction()) {
+
+  Function *Callee = CI->getCalledOperand() ?
+      dyn_cast_or_null<Function>(CI->getCalledOperand()->stripPointerCasts()) :
+      nullptr;
+  if (Callee) {
     if (Callee->isIntrinsic())
       return false;
+    // objc_msgSend stubs must be called, and can't have their address taken.
+    if (Callee->getName().startswith("objc_msgSend$"))
+      return false;
   }
   if (isCalleeOperand(CI, opIdx) &&
       CI->getOperandBundle(LLVMContext::OB_ptrauth).hasValue()) {

test/Interop/Cxx/apinotes/Inputs/SomeModule.apinotes

@@ -3,3 +3,7 @@ Name: SomeModule
 Classes:
 - Name: NSSomeClass
   SwiftName: SomeClass
+  Methods:
+  - Selector: 'didMoveToParentViewController:'
+    SwiftName: didMove(toParent:)
+    MethodKind: Instance

test/Interop/Cxx/apinotes/Inputs/SomeModule.h

@@ -2,3 +2,9 @@
   -(instancetype)init;
 @end
 
+// Extension, inspired by UIKit UIViewController.h
+@interface NSSomeClass (UIContainerViewControllerCallbacks)
+
+- (void)didMoveToParentViewController:(NSSomeClass *)parent;
+
+@end

test/Interop/Cxx/apinotes/apinotes-objcxx-smoke.swift

@@ -7,3 +7,16 @@ import SomeModule
 // CHECK-IDE-TEST: typealias NSSomeClass = SomeClass
 // CHECK-IDE-TEST-NEXT: class SomeClass
 class MyClass : SomeClass { }
+
+// CHECK-IDE-TEST: extension SomeClass {
+// CHECK-IDE-TEST-NEXT: class func didMove(toParent parent
+// CHECK-IDE-TEST-NEXT: func didMove(toParent parent:
+// CHECK-IDE-TEST-NEXT: @available
+// CHECK-IDE-TEST-NEXT: class func didMoveToParentViewController(_ parent
+// CHECK-IDE-TEST-NEXT: @available
+// CHECK-IDE-TEST-NEXT: func didMoveToParentViewController(_ parent
+
+// CHECK: didMove
+let a = SomeClass()
+let b = MyClass()
+let c = b!.didMove(toParent: a!)