IRGen: Tweak mapTypeOutOfContext() usage

Author: slavapestov

lib/IRGen/GenReflection.cpp

@@ -368,9 +368,6 @@ IRGenModule::getLoweredTypeRef(SILType loweredType,
   auto substTy =
     substOpaqueTypesWithUnderlyingTypes(loweredType, genericSig);
   auto type = substTy.getASTType();
-  if (substTy.hasArchetype())
-    type = type->mapTypeOutOfContext()->getCanonicalType();
-
   return getTypeRefImpl(*this, type, genericSig, role);
 }
 
@@ -1324,7 +1321,7 @@ class CaptureDescriptorBuilder : public ReflectionMetadataBuilder {
 
     // Now add typerefs of all of the captures.
     for (auto CaptureType : CaptureTypes) {
-      addLoweredTypeRef(CaptureType, sig);
+      addLoweredTypeRef(CaptureType.mapTypeOutOfContext(), sig);
     }
 
     // Add the pairs that make up the generic param -> metadata source map