[IRGen] Distributed: Always substitute underlying method parameters into accessor context

Author: xedin

lib/IRGen/GenDistributed.cpp

@@ -384,7 +384,9 @@ void DistributedAccessor::decodeArgument(unsigned argumentIdx,
                                          llvm::Value *argumentType,
                                          const SILParameterInfo &param,
                                          Explosion &arguments) {
-  auto &paramInfo = IGM.getTypeInfo(param.getSILStorageInterfaceType());
+  auto paramTy = Target->mapTypeIntoContext(param.getSILStorageInterfaceType());
+
+  auto &paramInfo = IGM.getTypeInfo(paramTy);
   // TODO: `emitLoad*` would actually load value witness table every
   // time it's called, which is sub-optimal but all of the APIs that
   // deal with value witness tables are currently hidden in GenOpaque.cpp
@@ -496,7 +498,6 @@ void DistributedAccessor::decodeArgument(unsigned argumentIdx,
 
   case ParameterConvention::Direct_Guaranteed:
   case ParameterConvention::Direct_Unowned: {
-    auto paramTy = param.getSILStorageInterfaceType();
     Address eltPtr = IGF.Builder.CreateElementBitCast(
         resultValue.getAddress(), IGM.getStorageType(paramTy));
 
@@ -506,11 +507,12 @@ void DistributedAccessor::decodeArgument(unsigned argumentIdx,
   }
 
   case ParameterConvention::Direct_Owned: {
+    assert(false && "owned");
     // Copy the value out at +1.
     cast<LoadableTypeInfo>(paramInfo).loadAsCopy(IGF, resultValue.getAddress(),
                                                  arguments);
-    LoadedArguments.push_back(std::make_pair(
-        resultValue.getAddress(), param.getSILStorageInterfaceType()));
+    LoadedArguments.push_back(
+        std::make_pair(resultValue.getAddress(), paramTy));
     break;
   }
   }