Merge pull request #25631 from aschwaighofer/ReplaceOpaqueTypesWithUnderlyingTypes_primary_file_mode

ReplaceOpaqueTypesWithUnderlyingTypes: In primary-file mode there mig…

Author: aschwaighofer

lib/AST/Type.cpp

@@ -2582,10 +2582,10 @@ operator()(SubstitutableType *maybeOpaqueType) const {
   }
 
   auto subs = opaqueRoot->getDecl()->getUnderlyingTypeSubstitutions();
-  // TODO: Check the resilience expansion, and handle opaque types with
-  // unknown underlying types. For now, all opaque types are always
-  // fragile.
-  assert(subs.hasValue() && "resilient opaque types not yet supported");
+  // If the body of the opaque decl providing decl has not been type checked we
+  // don't have a underlying subsitution.
+  if (!subs.hasValue())
+    return maybeOpaqueType;
 
   // Apply the underlying type substitutions to the interface type of the
   // archetype in question. This will map the inner generic signature of the
@@ -2633,7 +2633,10 @@ operator()(CanType maybeOpaqueType, Type replacementType,
   }
 
   auto subs = opaqueRoot->getDecl()->getUnderlyingTypeSubstitutions();
-  assert(subs.hasValue());
+  // If the body of the opaque decl providing decl has not been type checked we
+  // don't have a underlying subsitution.
+  if (!subs.hasValue())
+    return abstractRef;
 
   // Apply the underlying type substitutions to the interface type of the
   // archetype in question. This will map the inner generic signature of the

lib/SILOptimizer/Transforms/SpecializeOpaqueArchetypes.cpp

@@ -23,6 +23,11 @@
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CFG.h"
 
+#include "llvm/Support/CommandLine.h"
+
+llvm::cl::opt<bool>
+    EnableOpaqueArchetypeSpecializer("enable-opaque-archetype-specializer",
+                                     llvm::cl::init(true));
 
 using namespace swift;
 
@@ -459,6 +464,9 @@ void OpaqueSpecializerCloner::insertOpaqueToConcreteAddressCasts(
 namespace {
 class OpaqueArchetypeSpecializer : public SILFunctionTransform {
   void run() override {
+    if (!EnableOpaqueArchetypeSpecializer)
+      return;
+
     auto *context = getFunction();
 
     if (!context->shouldOptimize())

test/SILOptimizer/Inputs/specialize_opaque_type_archetypes_multifile_A.swift

@@ -0,0 +1,4 @@
+@inline(never)
+func bar2(_ x: Int) -> some P {
+  return x
+}

test/SILOptimizer/specialize_opaque_type_archetypes_multifile.swift

@@ -0,0 +1,25 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -O -Xllvm -enable-opaque-archetype-specializer -disable-availability-checking -primary-file %s %S/Inputs/specialize_opaque_type_archetypes_multifile_A.swift -emit-sil | %FileCheck %s
+
+protocol P {}
+
+extension Int : P {}
+
+struct Pair {
+  var x: Int64 = 0
+  var y: Int64 = 0
+}
+
+extension Pair : P {}
+
+@inline(never)
+func bar(_ x: Int) -> some P {
+  return x
+}
+
+// CHECK-LABEL: sil @$s43specialize_opaque_type_archetypes_multifile4testyyF : $@convention(thin) () -> () {
+// CHECK: function_ref @$s43specialize_opaque_type_archetypes_multifile4bar2yQrSiF : $@convention(thin) (Int) -> @out @_opaqueReturnTypeOf("$s43specialize_opaque_type_archetypes_multifile4bar2yQrSiF", 0)
+public func test() {
+  print(bar(5))
+  print(bar2(5))
+}