IRGen: Properly communicate ownership to IRGen from the LoadableByAddress pass

Communicate to IRGen whether a indirect promoted value was guaranteed or owned

rdar://35674625

Author: aschwaighofer

lib/IRGen/GenFunc.cpp

@@ -1000,12 +1000,12 @@ static llvm::Function *emitPartialApplicationForwarder(IRGenModule &IGM,
     auto argConvention = conventions[nextCapturedField++];
     switch (argConvention) {
     case ParameterConvention::Indirect_In:
+    case ParameterConvention::Indirect_In_Constant:
     case ParameterConvention::Direct_Owned:
       if (!consumesContext) subIGF.emitNativeStrongRetain(rawData, subIGF.getDefaultAtomicity());
       break;
 
     case ParameterConvention::Indirect_In_Guaranteed:
-    case ParameterConvention::Indirect_In_Constant:
     case ParameterConvention::Direct_Guaranteed:
       dependsOnContextLifetime = true;
       if (outType->getCalleeConvention() ==
@@ -1084,7 +1084,8 @@ static llvm::Function *emitPartialApplicationForwarder(IRGenModule &IGM,
 
       Explosion param;
       switch (fieldConvention) {
-      case ParameterConvention::Indirect_In: {
+      case ParameterConvention::Indirect_In:
+      case ParameterConvention::Indirect_In_Constant: {
         // The +1 argument is passed indirectly, so we need to copy into a
         // temporary.
         needsAllocas = true;
@@ -1101,7 +1102,6 @@ static llvm::Function *emitPartialApplicationForwarder(IRGenModule &IGM,
         break;
       }
       case ParameterConvention::Indirect_In_Guaranteed:
-      case ParameterConvention::Indirect_In_Constant:
         // The argument is +0, so we can use the address of the param in
         // the context directly.
         param.add(fieldAddr.getAddress());

lib/IRGen/LoadableByAddress.cpp

@@ -283,8 +283,12 @@ getNewParameter(GenericEnvironment *env, SILParameterInfo param,
       return param;
     }
   } else if (isLargeLoadableType(env, storageType, IGM)) {
-    return  SILParameterInfo(storageType.getSwiftRValueType(),
-                             ParameterConvention::Indirect_In_Constant);
+    if (param.getConvention() == ParameterConvention::Direct_Guaranteed)
+      return  SILParameterInfo(storageType.getSwiftRValueType(),
+                               ParameterConvention::Indirect_In_Guaranteed);
+    else
+      return  SILParameterInfo(storageType.getSwiftRValueType(),
+                               ParameterConvention::Indirect_In_Constant);
   } else {
     return param;
   }

test/IRGen/indirect_argument.sil

@@ -68,10 +68,9 @@ entry(%o : $*Huge, %x : $Huge):
 // CHECK:         bitcast %swift.refcounted* [[CLOSURE]] to <{ %swift.refcounted, %T17indirect_argument4HugeV }>*
 // CHECK:         call swiftcc void @_T024huge_partial_applicationTA(%T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) %0, %swift.refcounted* swiftself [[CLOSURE]])
 // CHECK:       define internal swiftcc void @_T024huge_partial_applicationTA(%T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}), %swift.refcounted* swiftself)
-// CHECK:         [[T0:%.*]] = bitcast %swift.refcounted* %1
-// CHECK:         [[T2:%.*]] = getelementptr inbounds {{.*}}[[T0]], i32 0, i32 1
+// CHECK:         [[TMP_ARG:%.*]] = alloca
 // CHECK-NOT:     tail
-// CHECK:         call swiftcc void @huge_partial_application(%T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) %0, %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) [[T2]])
+// CHECK:         call swiftcc void @huge_partial_application(%T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) %0, %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) [[TMP_ARG]])
 sil @huge_partial_application : $@convention(thin) (Huge, Huge) -> () {
 entry(%x : $Huge, %y : $Huge):
   %f = function_ref @huge_partial_application : $@convention(thin) (Huge, Huge) -> ()
@@ -86,10 +85,9 @@ entry(%x : $Huge, %y : $Huge):
 // CHECK:         bitcast %swift.refcounted* [[CLOSURE]] to <{ %swift.refcounted, %T17indirect_argument4HugeV }>*
 // CHECK:         call swiftcc void @_T030huge_partial_application_stretTA(%T17indirect_argument4HugeV* noalias nocapture sret [[TMP_RET]], %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) %1, %swift.refcounted* swiftself [[CLOSURE]])
 // CHECK:       define internal swiftcc void @_T030huge_partial_application_stretTA(%T17indirect_argument4HugeV* noalias nocapture sret, %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}), %swift.refcounted* swiftself)
-// CHECK:         [[T0:%.*]] = bitcast %swift.refcounted* %2
-// CHECK:         [[T2:%.*]] = getelementptr inbounds {{.*}}[[T0]], i32 0, i32 1
+// CHECK:         [[TMP_ARG:%.*]] = alloca
 // CHECK-NOT:     tail
-// CHECK:         call swiftcc void @huge_partial_application_stret(%T17indirect_argument4HugeV* noalias nocapture sret %0, %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) %1, %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) [[T2]])
+// CHECK:         call swiftcc void @huge_partial_application_stret(%T17indirect_argument4HugeV* noalias nocapture sret %0, %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) %1, %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}) [[TMP_ARG]])
 sil @huge_partial_application_stret : $@convention(thin) (Huge, Huge) -> Huge {
 entry(%x : $Huge, %y : $Huge):
   %f = function_ref @huge_partial_application_stret : $@convention(thin) (Huge, Huge) -> Huge