[cxx-interop] Record extra layer of indirection when calulating clang type from SILType.

Author: zoecarver

lib/IRGen/GenCall.cpp

@@ -2916,8 +2916,9 @@ llvm::CallInst *IRBuilder::CreateCall(const FunctionPointer &fn,
       fn.getRawPointer()->getType()->getPointerElementType());
   llvm::CallInst *call =
       IRBuilderBase::CreateCall(fnTy, fn.getRawPointer(), args, bundles);
+
   call->setAttributes(
-      fixUpTypesInByValAndStructRetAttributes(fnTy, call->getAttributes()));
+      fixUpTypesInByValAndStructRetAttributes(fnTy, fn.getAttributes()));
   call->setCallingConv(fn.getCallingConv());
   return call;
 }

lib/IRGen/GenClangType.cpp

@@ -32,6 +32,10 @@ clang::CanQualType IRGenModule::getClangType(CanType type) {
 }
 
 clang::CanQualType IRGenModule::getClangType(SILType type) {
+  if (type.isForeignReferenceType())
+    return getClangType(type.getASTType()
+                            ->wrapInPointer(PTK_UnsafePointer)
+                            ->getCanonicalType());
   return getClangType(type.getASTType());
 }
 

test/Interop/Cxx/foreign-reference/Inputs/move-only.h

@@ -29,6 +29,19 @@ struct __attribute__((swift_attr("import_as_ref"))) MoveOnly {
 
 MoveOnly moveIntoResult(MoveOnly &x) { return move(x); }
 
+struct __attribute__((swift_attr("import_as_ref"))) NoCopyMove {
+  NoCopyMove() = default;
+  NoCopyMove(const NoCopyMove &) = delete;
+  NoCopyMove(NoCopyMove &&) = delete;
+
+  int test() const { return 42; }
+  int testMutable() { return 42; }
+
+  static NoCopyMove *create() {
+    return new (malloc(sizeof(NoCopyMove))) NoCopyMove();
+  }
+};
+
 struct __attribute__((swift_attr("import_as_ref"))) HasMoveOnlyChild {
   MoveOnly child;
 

test/Interop/Cxx/foreign-reference/move-only.swift

@@ -19,6 +19,15 @@ MoveOnlyTestSuite.test("MoveOnly") {
   expectEqual(x.test(), 42)
 }
 
+MoveOnlyTestSuite.test("NoCopyMove") {
+  var x = NoCopyMove.create()
+  expectEqual(x.test(), 42)
+  expectEqual(x.testMutable(), 42)
+
+  x = NoCopyMove.create()
+  expectEqual(x.test(), 42)
+}
+
 MoveOnlyTestSuite.test("PrivateCopyCtor") {
   var x = PrivateCopyCtor.create()
   expectEqual(x.test(), 42)