Merge pull request #61322 from CodaFi/whats-in-a-name

Work Around _swiftStaticArrayMetadata Alias Breakage

Author: CodaFi

lib/IRGen/GenConstant.cpp

@@ -288,9 +288,11 @@ llvm::Constant *irgen::emitConstantObject(IRGenModule &IGM, ObjectInst *OI,
       IGM.swiftImmortalRefCount = var;
     }
     if (!IGM.swiftStaticArrayMetadata) {
+      // HACK: This should be an alias to this symbol rather than a direct
+      // reference.
       auto *var = new llvm::GlobalVariable(IGM.Module, IGM.TypeMetadataStructTy,
                                         /*constant*/ true, llvm::GlobalValue::ExternalLinkage,
-                                        /*initializer*/ nullptr, "_swiftStaticArrayMetadata");
+                                        /*initializer*/ nullptr, "$ss19__EmptyArrayStorageCN");
       IGM.swiftStaticArrayMetadata = var;
     }
     elts[0] = llvm::ConstantStruct::get(ObjectHeaderTy, {

stdlib/public/stubs/GlobalObjects.cpp

@@ -85,12 +85,6 @@ __asm__("  .globl __swiftImmortalRefCount\n");
   #error("unsupported pointer width")
 #endif
 
-// Static arrays can only contain trivial elements. Therefore we can reuse
-// the metadata of the empty array buffer. The important thing is that its
-// deinit is a no-op and does not actually destroy any elements.
-__asm__("  .globl __swiftStaticArrayMetadata\n");
-__asm__(".set __swiftStaticArrayMetadata, _$ss19__EmptyArrayStorageCN\n");
-
 #endif
 
 SWIFT_RUNTIME_STDLIB_API