Merge pull request #9165 from shajrawi/fix_linux_build

Fix runtime failure on Linux due to large values by address pass

Author: Joe Shajrawi

lib/IRGen/LoadableByAddress.cpp

@@ -97,10 +97,6 @@ static bool modifiableFunction(CanSILFunctionType funcType) {
     // C functions should use the old ABI
     return false;
   }
-  if (funcType->getRepresentation() == SILFunctionTypeRepresentation::Method) {
-    // C functions should use the old ABI
-    return false;
-  }
   return true;
 }
 
@@ -396,10 +392,6 @@ static bool modifiableApply(ApplySite applySite, irgen::IRGenModule &Mod) {
       SILFunctionTypeRepresentation::CFunctionPointer) {
     return false;
   }
-  if (applySite.getSubstCalleeType()->getRepresentation() ==
-      SILFunctionTypeRepresentation::Method) {
-    return false;
-  }
   auto callee = applySite.getCallee();
   if (dyn_cast<ProjectBlockStorageInst>(callee)) {
     return false;
@@ -433,9 +425,6 @@ void LargeValueVisitor::visitApply(ApplySite applySite) {
 }
 
 static bool isMethodInstUnmodifiable(MethodInst *instr) {
-  if (dyn_cast<ClassMethodInst>(instr)) {
-    return true;
-  }
   for (auto *user : instr->getUses()) {
     if (ApplySite::isa(user->getUser())) {
       ApplySite applySite = ApplySite(user->getUser());
@@ -447,10 +436,6 @@ static bool isMethodInstUnmodifiable(MethodInst *instr) {
           SILFunctionTypeRepresentation::CFunctionPointer) {
         return true;
       }
-      if (applySite.getSubstCalleeType()->getRepresentation() ==
-          SILFunctionTypeRepresentation::Method) {
-        return true;
-      }
     }
   }
   return false;

test/IRGen/indirect_argument.sil

@@ -14,8 +14,7 @@ struct HugeAlignment {
 // TODO: could be the context param
 // CHECK-LABEL-64: define{{( protected)?}} swiftcc void @huge_method(%T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}))
 // CHECK-LABEL-32: define{{( protected)?}} swiftcc void @huge_method(%T17indirect_argument4HugeV* noalias nocapture swiftself dereferenceable({{.*}}))
-// CHECK-64:         call swiftcc void @huge_method(%T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}})
-// CHECK-32:         call swiftcc void @huge_method(%T17indirect_argument4HugeV* noalias nocapture swiftself dereferenceable({{.*}})
+// CHECK:         call swiftcc void @huge_method(%T17indirect_argument4HugeV* noalias nocapture swiftself dereferenceable({{.*}})
 sil @huge_method : $@convention(method) Huge -> () {
 entry(%x : $Huge):
   %f = function_ref @huge_method : $@convention(method) Huge -> ()
@@ -61,7 +60,8 @@ entry(%o : $*Huge, %x : $Huge):
 }
 
 // CHECK-LABEL: define{{( protected)?}} swiftcc void @huge_partial_application(%T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}), %T17indirect_argument4HugeV* noalias nocapture dereferenceable({{.*}}))
-// CHECK:         [[CLOSURE:%.*]] = call noalias %swift.refcounted* @swift_rt_swift_allocObject
+// CHECK-32:         [[CLOSURE:%.*]] = call noalias %swift.refcounted* @swift_rt_swift_allocObject
+// CHECK-64:         [[CLOSURE:%.*]] = call noalias %swift.refcounted* @swift_rt_swift_allocObject
 // CHECK:         bitcast %swift.refcounted* [[CLOSURE]] to <{ %swift.refcounted, %T17indirect_argument4HugeV }>*
 // CHECK:         call void @llvm.memcpy
 // CHECK-64:         call swiftcc void @_T024huge_partial_applicationTA(%T17indirect_argument4HugeV* noalias nocapture dereferenceable(40) %0, %swift.refcounted* swiftself [[CLOSURE]])