Fix generic detection, assert we have addressable metadata, expand tests

Author: kubamracek

SwiftCompilerSources/Sources/Optimizer/Utilities/OptUtils.swift

@@ -466,8 +466,9 @@ extension Instruction {
     // Metatypes (and upcasts of them to existentials) can be used as static initializers for SE-0492, as long as they
     // are not generic or resilient
     case let mti as MetatypeInst:
-      if !mti.type.hasTypeParameter,
+      if !mti.type.isGenericAtAnyLevel,
         let nominal = mti.type.canonicalType.instanceTypeOfMetatype.nominal,
+        !nominal.isGenericAtAnyLevel,
         !nominal.isResilient(in: mti.parentFunction) {
         return true
       }
@@ -476,7 +477,7 @@ extension Instruction {
       let isAnyConformanceResilient = iemi.conformances.contains { 
         !$0.protocol.isInvertible && $0.isResilientConformance(currentModule: context.currentModuleContext)
       }
-      return !iemi.type.hasTypeParameter && !isAnyConformanceResilient
+      return !iemi.type.isGenericAtAnyLevel && !isAnyConformanceResilient
 
     case is StructInst,
          is TupleInst,

lib/IRGen/GenConstant.cpp

@@ -24,6 +24,7 @@
 #include "GenIntegerLiteral.h"
 #include "GenStruct.h"
 #include "GenTuple.h"
+#include "MetadataRequest.h"
 #include "TypeInfo.h"
 #include "StructLayout.h"
 #include "Callee.h"
@@ -420,6 +421,7 @@ Explosion irgen::emitConstantValue(IRGenModule &IGM, SILValue operand,
   } else if (auto *mti = dyn_cast<MetatypeInst>(operand)) {
     auto metaTy = mti->getType().castTo<MetatypeType>();
     auto type = metaTy.getInstanceType();
+    ASSERT(isCanonicalCompleteTypeMetadataStaticallyAddressable(IGM, type));
     return IGM.getAddrOfTypeMetadata(type);
   } else if (auto *iemi = dyn_cast<InitExistentialMetatypeInst>(operand)) {
     auto *mti =
@@ -428,10 +430,11 @@ Explosion irgen::emitConstantValue(IRGenModule &IGM, SILValue operand,
 
     auto metaTy = mti->getType().castTo<MetatypeType>();
     auto type = metaTy.getInstanceType();
-    llvm::Constant *metatype = IGM.getAddrOfTypeMetadata(type);
+    ASSERT(isCanonicalCompleteTypeMetadataStaticallyAddressable(IGM, type));
+    llvm::Constant *metadata = IGM.getAddrOfTypeMetadata(type);
 
     Explosion result;
-    emitExistentialMetatypeContainer(IGM, result, iemi->getType(), metatype,
+    emitExistentialMetatypeContainer(IGM, result, iemi->getType(), metadata,
                                      iemi->getOperand()->getType(),
                                      iemi->getConformances());
     return result;

lib/IRGen/GenDecl.cpp

@@ -25,11 +25,13 @@
 #include "swift/AST/ModuleDependencies.h"
 #include "swift/AST/NameLookup.h"
 #include "swift/AST/Pattern.h"
+#include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/TypeMemberVisitor.h"
 #include "swift/AST/Types.h"
 #include "swift/Basic/Assertions.h"
 #include "swift/Basic/Mangler.h"
+#include "swift/Basic/PrettyStackTrace.h"
 #include "swift/ClangImporter/ClangModule.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "swift/IRGen/Linking.h"
@@ -2931,6 +2933,9 @@ Address IRGenModule::getAddrOfSILGlobalVariable(SILGlobalVariable *var,
 llvm::Constant *IRGenModule::getGlobalInitValue(SILGlobalVariable *var,
                                                 llvm::Type *storageType,
                                                 Alignment alignment) {
+  PrettyStackTraceStringAction trace(
+      "constant-folding init value for SIL global", var->getName());
+
   if (var->isInitializedObject()) {
     StructLayout *layout = StaticObjectLayouts[var].layout.get();
     ObjectInst *oi = cast<ObjectInst>(var->getStaticInitializerValue());

test/SILOptimizer/static_init_metatypes.swift

@@ -4,6 +4,11 @@
 // RUN: %target-swift-frontend %s -parse-as-library -module-name=test -emit-ir | %FileCheck --check-prefix=IR %s
 // RUN: %target-swift-frontend %s -parse-as-library -O -module-name=test -emit-ir | %FileCheck --check-prefix=IR %s
 
+// RUN: %target-run-simple-swift(-parse-as-library)
+// RUN: %target-run-simple-swift(-parse-as-library -O)
+
+// REQUIRES: executable_test
+
 public protocol MyProtocol {}
 public protocol MyProtocol2 {}
 
@@ -67,10 +72,8 @@ public let metatype14: any (Hashable & MyProtocol).Type = S.self
 // SIL: sil_global [let] @$s4test10metatype14SH_AA10MyProtocolpXpvp : $@thick any (Hashable & MyProtocol).Type
 // SIL-EMPTY:
 public let metatype15: Any.Type = Array<Int>.self
-// SIL:      sil_global [let] @$s4test10metatype15ypXpvp : $@thick any Any.Type = {
-// SIL-NEXT:   %0 = metatype $@thick Array<Int>.Type           // user: %1
-// SIL-NEXT:   %initval = init_existential_metatype %0, $@thick any Any.Type
-// SIL-NEXT: }
+// SIL: sil_global [let] @$s4test10metatype15ypXpvp : $@thick any Any.Type
+// SIL-EMPTY:
 public let metatype16: any (Hashable & Sendable).Type = Array<Int>.self
 // SIL: sil_global [let] @$s4test10metatype16SH_s8SendablepXpvp : $@thick any (Hashable & Sendable).Type
 // SIL-EMPTY:
@@ -80,11 +83,26 @@ public let metatype17: Any.Type = (Bool.random() ? Array<Int>.self : Array<Bool>
 public let metatype18: Any.Type = Mirror.self // resilient
 // SIL: sil_global [let] @$s4test10metatype18ypXpvp : $@thick any Any.Type
 // SIL-EMPTY:
+public var metatype19: Any.Type = (any MyProtocol).self
+// SIL: sil_global @$s4test10metatype19ypXpvp : $@thick any Any.Type
+// SIL-EMPTY:
+public var metatype20: [Any.Type] = [(any MyProtocol).self]
+// SIL: sil_global @$s4test10metatype20SayypXpGvp : $Array<any Any.Type>
+// SIL-EMPTY:
+public var metatype21: [Any.Type] = [Int.self]
+// SIL: sil_global @$s4test10metatype21SayypXpGvp : $Array<any Any.Type>
+// SIL-EMPTY:
+public var metatype22: [Any.Type] = [S.self]
+// SIL: sil_global @$s4test10metatype22SayypXpGvp : $Array<any Any.Type>
+// SIL-EMPTY:
+
+// Only to detect link-time missing symbols
+@main
+struct Main { static func main() { } }
 
 // IR: @"$s4test9metatype3ypXpvp" = {{.*}}constant ptr @"$sSiN"
 // IR: @"$s4test9metatype4ypXpvp" = {{.*}}constant ptr getelementptr inbounds{{.*}} ({{.*}}, ptr @"$s4test1SVMf", {{.*}})
 // IR: @"$s4test9metatype5AA10MyProtocol_pXpvp" = {{.*}}constant <{ ptr, ptr }> <{ ptr @"$sSiN", ptr @"$sSi4test10MyProtocolAAWP" }>
 // IR: @"$s4test9metatype6AA10MyProtocol_pXpvp" = {{.*}}constant <{ ptr, ptr }> <{ ptr getelementptr inbounds{{.*}} ({{.*}}, ptr @"$s4test1SVMf", {{.*}}), ptr @"$s4test1SVAA10MyProtocolAAWP" }>
 // IR: @"$s4test9metatype7AA10MyProtocol_AA0C9Protocol2pXpvp" = {{.*}}constant <{ ptr, ptr, ptr }> <{ ptr @"$sSiN", ptr @"$sSi4test10MyProtocolAAWP", ptr @"$sSi4test11MyProtocol2AAWP" }>
 // IR: @"$s4test9metatype8AA10MyProtocol_AA0C9Protocol2pXpvp" = {{.*}}constant <{ ptr, ptr, ptr }> <{ ptr getelementptr inbounds{{.*}} ({{.*}}, ptr @"$s4test1SVMf", {{.*}}), ptr @"$s4test1SVAA10MyProtocolAAWP", ptr @"$s4test1SVAA11MyProtocol2AAWP" }>
-// IR: @"$s4test10metatype15ypXpvp" = {{.*}}constant ptr getelementptr inbounds{{.*}} ({{.*}}, ptr @"$sSaySiGMf", {{.*}})