IRGen: Clean up duplication in withOpaqueTypeGenericArgs()

Author: slavapestov

lib/IRGen/GenArchetype.cpp

@@ -440,17 +440,10 @@ withOpaqueTypeGenericArgs(IRGenFunction &IGF,
     enumerateGenericSignatureRequirements(
         opaqueDecl->getGenericSignature().getCanonicalSignature(),
         [&](GenericRequirement reqt) {
-          auto ty = reqt.getTypeParameter().subst(archetype->getSubstitutions())
-                        ->getReducedType(opaqueDecl->getGenericSignature());
-          if (reqt.isAnyWitnessTable()) {
-            auto ref =
-                ProtocolConformanceRef(reqt.getProtocol())
-                    .subst(reqt.getTypeParameter(), archetype->getSubstitutions());
-            args.push_back(emitWitnessTableRef(IGF, ty, ref));
-          } else {
-            assert(reqt.isAnyMetadata());
-            args.push_back(IGF.emitAbstractTypeMetadataRef(ty));
-          }
+          auto arg = emitGenericRequirementFromSubstitutions(
+              IGF, reqt, archetype->getSubstitutions(),
+              MetadataState::Abstract);
+          args.push_back(arg);
           types.push_back(args.back()->getType());
         });
     auto bufTy = llvm::StructType::get(IGF.IGM.getLLVMContext(), types);

test/Interpreter/Inputs/opaque_result_type_runtime_call_other.swift

@@ -0,0 +1,3 @@
+public protocol P {}
+
+public func callee<T: P>(t: T) -> some P { return t }

test/Interpreter/opaque_result_type_runtime_call.swift

@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift-dylib(%t/%target-library-name(opaque_result_type_runtime_call_other)) -enable-library-evolution %S/Inputs/opaque_result_type_runtime_call_other.swift -emit-module -emit-module-path %t/opaque_result_type_runtime_call_other.swiftmodule -module-name opaque_result_type_runtime_call_other
+// RUN: %target-codesign %t/%target-library-name(opaque_result_type_runtime_call_other)
+// RUN: %target-build-swift %s -lopaque_result_type_runtime_call_other -I %t -L %t -o %t/main %target-rpath(%t)
+// RUN: %target-codesign %t/main
+// RUN: %target-run %t/main %t/%target-library-name(opaque_result_type_runtime_call_other) | %FileCheck %s
+
+import opaque_result_type_runtime_call_other
+
+extension String: P {}
+
+func caller<T: P>(t: T) {
+  print(callee(t: t))
+}
+
+// CHECK: Hello, world
+caller(t: "Hello, world")