[cxx-interop] Fix inline operators for address-only types.

Author: zoecarver

lib/SIL/IR/SILFunctionType.cpp

@@ -1579,13 +1579,27 @@ class DestructureInputs {
     // Add any leading foreign parameters.
     maybeAddForeignParameters();
 
+    bool isCxxOperator = origType.isCXXMethod() &&
+                         origType.getCXXMethod()->isOverloadedOperator();
+
     // Process all the non-self parameters.
     for (unsigned i = 0; i != numNonSelfParams; ++i) {
       auto ty = params[i].getParameterType();
       auto eltPattern = origType.getFunctionParamType(i);
       auto flags = params[i].getParameterFlags();
+      bool forSelf = false;
+
+      // If we have an inline operator, when it was imported, it was turned
+      // from a method into a static function. So, we need to shift over the
+      // params by one and use "self" as the first param's type.
+      if (isCxxOperator) {
+        if (i == 0)
+          forSelf = true;
+        else if (i == 1)
+          NextOrigParamIndex--;
+      }
 
-      visit(flags.getValueOwnership(), /*forSelf=*/false, eltPattern, ty,
+      visit(flags.getValueOwnership(), forSelf, eltPattern, ty,
             silRepresentation, flags.isNoDerivative());
     }
 

test/Interop/Cxx/operators/Inputs/member-inline.h

@@ -6,4 +6,14 @@ struct IntBox {
   IntBox operator+(IntBox rhs) { return IntBox{.value = value + rhs.value}; }
 };
 
+struct AddressOnlyIntWrapper {
+  int value;
+  AddressOnlyIntWrapper(int value) : value(value) {}
+  AddressOnlyIntWrapper(AddressOnlyIntWrapper const &other)
+      : value(other.value) {}
+  AddressOnlyIntWrapper operator-(AddressOnlyIntWrapper rhs) {
+    return AddressOnlyIntWrapper(value - rhs.value);
+  }
+};
+
 #endif

test/Interop/Cxx/operators/member-inline-irgen.swift

@@ -5,7 +5,17 @@
 
 import MemberInline
 
-public func add(_ lhs: inout IntBox, _ rhs: IntBox) -> IntBox { lhs + rhs }
-
+// CHECK-LABEL: define {{.*i32|i64}} @"$s4main3addySo6IntBoxVADz_ADtF"
 // CHECK: call [[RES:i32|i64]] [[NAME:@(_ZN6IntBoxplES_|"\?\?HIntBox@@QEAA\?AU0@U0@@Z")]](%struct.IntBox* {{%[0-9]+}}, {{i32|\[1 x i32\]|i64|%struct.IntBox\* byval align 4}} {{%[0-9]+}})
+// CHECK: ret [[RES]]
+
 // CHECK: define linkonce_odr [[RES]] [[NAME]](%struct.IntBox* %this, {{i32 %rhs.coerce|\[1 x i32\] %rhs.coerce|i64 %rhs.coerce|%struct.IntBox\* byval\(%struct.IntBox\) align 4 %rhs}})
+public func add(_ lhs: inout IntBox, _ rhs: IntBox) -> IntBox { lhs + rhs }
+
+// CHECK-LABEL: define {{.*}}void @"$s4main24subAddressOnlyIntWrapperySo0cdeF0VADz_ADtF"
+// CHECK: call void [[NAME:@(_ZN21AddressOnlyIntWrappermiES_|"\?\?GAddressOnlyIntWrapper@@QEAA\?AU0@U0@@Z")]](%struct.AddressOnlyIntWrapper* {{%[0-9]+}}, %struct.AddressOnlyIntWrapper* {{%[0-9]+}}, %struct.AddressOnlyIntWrapper* {{%[0-9]+}})
+// CHECK: ret void
+
+// CHECK: define linkonce_odr void [[NAME]](%struct.AddressOnlyIntWrapper* {{.*}}%agg.result, %struct.AddressOnlyIntWrapper* %this, %struct.AddressOnlyIntWrapper* %rhs)
+
+public func subAddressOnlyIntWrapper(_ lhs: inout AddressOnlyIntWrapper, _ rhs: AddressOnlyIntWrapper) -> AddressOnlyIntWrapper { lhs - rhs }

test/Interop/Cxx/operators/member-inline-module-interface.swift

@@ -3,3 +3,7 @@
 // CHECK: struct IntBox {
 // CHECK:   static func + (lhs: inout IntBox, rhs: IntBox) -> IntBox
 // CHECK: }
+
+// CHECK: struct AddressOnlyIntWrapper {
+// CHECK:   static func - (lhs: inout AddressOnlyIntWrapper, rhs: AddressOnlyIntWrapper) -> AddressOnlyIntWrapper
+// CHECK: }

test/Interop/Cxx/operators/member-inline-silgen.swift

@@ -2,13 +2,27 @@
 
 import MemberInline
 
-public func add(_ lhs: inout IntBox, _ rhs: IntBox) -> IntBox { lhs + rhs }
-
+// CHECK-LABEL: sil @$s4main9addIntBoxySo0cD0VADz_ADtF : $@convention(thin) (@inout IntBox, IntBox) -> IntBox
 // CHECK: bb0([[SELF:%.*]] : $*IntBox, [[RHS:%.*]] : $IntBox):
-
 // CHECK: [[SELFACCESS:%.*]] = begin_access [modify] [static] [[SELF]] : $*IntBox
 // CHECK: [[OP:%.*]] = function_ref [[NAME:@(_ZN6IntBoxplES_|\?\?HIntBox@@QEAA\?AU0@U0@@Z)]] : $@convention(c) (@inout IntBox, IntBox) -> IntBox
 // CHECK: apply [[OP]]([[SELFACCESS]], [[RHS]]) : $@convention(c) (@inout IntBox, IntBox) -> IntBox
 // CHECK: end_access [[SELFACCESS]] : $*IntBox
+// CHECK: end sil function '$s4main9addIntBoxySo0cD0VADz_ADtF'
 
 // CHECK: sil [clang IntBox."+"] [[NAME]] : $@convention(c) (@inout IntBox, IntBox) -> IntBox
+public func addIntBox(_ lhs: inout IntBox, _ rhs: IntBox) -> IntBox { lhs + rhs }
+
+// CHECK-LABEL: sil @$s4main24subAddressOnlyIntWrapperySo0cdeF0VADz_ADtF : $@convention(thin) (@inout AddressOnlyIntWrapper, @in_guaranteed AddressOnlyIntWrapper) -> @out AddressOnlyIntWrapper
+// CHECK: bb0([[OUT:%.*]] : $*AddressOnlyIntWrapper, [[LHS:%.*]] : $*AddressOnlyIntWrapper, [[RHS:%.*]] : $*AddressOnlyIntWrapper):
+// CHECK: [[RHS_TMP:%.*]] = alloc_stack $AddressOnlyIntWrapper
+// CHECK: copy_addr [[RHS]] to [initialization] [[RHS_TMP]] : $*AddressOnlyIntWrapper
+// CHECK: [[LHS_ACCESS:%.*]] = begin_access [modify] [static] [[LHS]] : $*AddressOnlyIntWrapper
+// CHECK: [[FN:%.*]] = function_ref [[NAME:@(_ZN21AddressOnlyIntWrappermiES_|\?\?GAddressOnlyIntWrapper@@QEAA\?AU0@U0@@Z)]] : $@convention(c) (@inout AddressOnlyIntWrapper, @in AddressOnlyIntWrapper) -> @out AddressOnlyIntWrapper
+// CHECK: apply [[FN]]([[OUT]], [[LHS_ACCESS]], [[RHS_TMP]]) : $@convention(c) (@inout AddressOnlyIntWrapper, @in AddressOnlyIntWrapper) -> @out AddressOnlyIntWrapper
+// CHECK: end_access [[LHS_ACCESS]]
+// CHECK: dealloc_stack [[RHS_TMP]]
+// CHECK: end sil function '$s4main24subAddressOnlyIntWrapperySo0cdeF0VADz_ADtF'
+
+// CHECK: sil [clang AddressOnlyIntWrapper."-"] [[NAME]] : $@convention(c) (@inout AddressOnlyIntWrapper, @in AddressOnlyIntWrapper) -> @out AddressOnlyIntWrapper
+public func subAddressOnlyIntWrapper(_ lhs: inout AddressOnlyIntWrapper, _ rhs: AddressOnlyIntWrapper) -> AddressOnlyIntWrapper { lhs - rhs }

test/Interop/Cxx/operators/member-inline-typechecker.swift

@@ -2,7 +2,10 @@
 
 import MemberInline
 
-var lhs = IntBox(value: 42)
-let rhs = IntBox(value: 23)
+var lhsLoadable = IntBox(value: 42)
+let rhsLoadable = IntBox(value: 23)
+let resultPlusLoadable = lhsLoadable + rhsLoadable
 
-let resultPlus = lhs + rhs
+var lhsAddressOnly = AddressOnlyIntWrapper(value: 42)
+var rhsAddressOnly = AddressOnlyIntWrapper(value: 23)
+let resultMinusAddressOnly = lhsAddressOnly - rhsAddressOnly

test/Interop/Cxx/operators/member-inline.swift

@@ -19,4 +19,12 @@ OperatorsTestSuite.test("plus") {
   expectEqual(65, result.value)
 }
 
+OperatorsTestSuite.test("AddressOnlyIntWrapper.plus") {
+  var lhs = AddressOnlyIntWrapper(value: 42)
+  let rhs = AddressOnlyIntWrapper(value: 23)
+
+  let result = lhs - rhs
+  expectEqual(19, result.value)
+}
+
 runAllTests()