Merge pull request #9399 from apple/arg_param_mismatch_cherrypick

Merge pull request #9393 from shajrawi/arg_param_mismatch

Author: Joe Shajrawi

lib/IRGen/LoadableByAddress.cpp

@@ -249,6 +249,9 @@ static SILType getNewOptionalFunctionType(GenericEnvironment *GenericEnv,
         auto newType = OptionalType::get(optKind, currCanType);
         CanType newCanType = newType->getCanonicalType();
         newSILType = SILType::getPrimitiveObjectType(newCanType);
+        if (storageType.isAddress()) {
+          newSILType = newSILType.getAddressType();
+        }
       }
     }
   }
@@ -276,6 +279,9 @@ getNewArgTys(GenericEnvironment *GenericEnv, ArrayRef<SILParameterInfo> params,
                                 currSILFunctionType->getParameters(), Mod)) {
         SILType newSILType =
             getNewSILFunctionType(GenericEnv, currSILFunctionType, Mod);
+        if (storageType.isAddress()) {
+          newSILType = newSILType.getAddressType();
+        }
         auto newParam = SILParameterInfo(newSILType.getSwiftRValueType(),
                                          param.getConvention());
         newArgTys.push_back(newParam);
@@ -311,6 +317,9 @@ static SILType getNewSILType(GenericEnvironment *GenericEnv,
     if (containsLargeLoadable(GenericEnv, currSILFunctionType->getParameters(),
                               Mod)) {
       newSILType = getNewSILFunctionType(GenericEnv, currSILFunctionType, Mod);
+      if (storageType.isAddress()) {
+        newSILType = newSILType.getAddressType();
+      }
     }
   } else if (isLargeLoadableType(GenericEnv, storageType, Mod)) {
     newSILType = storageType.getAddressType();
@@ -427,6 +436,7 @@ void LargeValueVisitor::mapValueStorage() {
       case ValueKind::StructElementAddrInst:
       case ValueKind::RefTailAddrInst:
       case ValueKind::RefElementAddrInst:
+      case ValueKind::BeginAccessInst:
       case ValueKind::EnumInst: {
         // TODO Any more instructions to add here?
         visitResultTyInst(currIns);
@@ -1315,6 +1325,9 @@ static void castTupleInstr(SILInstruction *instr, IRGenModule &Mod) {
     genEnv = getGenericEnvironment(instr->getModule(), canFuncType);
   }
   SILType newSILType = getNewSILFunctionType(genEnv, funcType, Mod);
+  if (currSILType.isAddress()) {
+    newSILType = newSILType.getAddressType();
+  }
   auto II = instr->getIterator();
   ++II;
   SILBuilder castBuilder(II);
@@ -1594,6 +1607,13 @@ static void rewriteFunction(StructLoweringState &pass,
           newSILType.getAddressType());
       break;
     }
+    case ValueKind::BeginAccessInst: {
+      auto *convInstr = dyn_cast<BeginAccessInst>(instr);
+      newInstr = resultTyBuilder.createBeginAccess(Loc, convInstr->getOperand(),
+                                                   convInstr->getAccessKind(),
+                                                   convInstr->getEnforcement());
+      break;
+    }
     case ValueKind::EnumInst: {
       EnumInst *convInstr = dyn_cast<EnumInst>(instr);
       SILValue operand =

test/IRGen/big_types_corner_cases.swift

@@ -12,6 +12,32 @@ public struct BigStruct {
   var i8 : Int32 = 8
 }
 
+func takeClosure(execute block: () -> Void) {
+}
+
+class OptionalInoutFuncType {
+  private var lp :  BigStruct?
+  private var _handler : ((BigStruct?, Error?) -> ())?
+
+  func execute(_ error: Error?) {
+    var p : BigStruct?
+    var handler: ((BigStruct?, Error?) -> ())?
+    
+    takeClosure {
+      p = self.lp
+      handler = self._handler
+      self._handler = nil
+    }
+
+    handler?(p, error)
+  }
+}
+
+// CHECK-LABEL: define{{( protected)?}} internal swiftcc void @_T022big_types_corner_cases21OptionalInoutFuncTypeC7executeys5Error_pSgFyycfU_(%T22big_types_corner_cases9BigStructVSg* nocapture dereferenceable({{.*}}), %T22big_types_corner_cases21OptionalInoutFuncTypeC*, %T22big_types_corner_cases9BigStructVSgs5Error_pSgIxcx_Sg* nocapture dereferenceable({{.*}})
+// CHECK: call void @_T0SqWy
+// CHECK: call void @_T0SqWe
+// CHECK: ret void
+
 public func f1_returns_BigType(_ x: BigStruct) -> BigStruct {
   return x
 }
@@ -84,4 +110,4 @@ class Foo {
 // CHECK: getelementptr inbounds %T22big_types_corner_cases3FooC, %T22big_types_corner_cases3FooC*
 // CHECK: getelementptr inbounds void (i8*, %swift.refcounted*, %T22big_types_corner_cases3FooC*)*, void (i8*, %swift.refcounted*, %T22big_types_corner_cases3FooC*)**
 // CHECK: call noalias %swift.refcounted* @swift_rt_swift_allocObject(%swift.type* getelementptr inbounds (%swift.full_boxmetadata, %swift.full_boxmetadata*
-// CHECK: ret { i8*, %swift.refcounted* }
+// CHECK: ret { i8*, %swift.refcounted* }