Merge pull request swiftlang#76448 from eeckstein/fix-static-init-cloner

StaticInitCloner: skip begin_access instructions when cloning the initial value of a global

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/Utilities/StaticInitCloner.swift

@@ -46,7 +46,16 @@ struct StaticInitCloner<Context: MutatingContext> {
       return getClonedValue(of: value)
     }
 
+    if let beginAccess = value as? BeginAccessInst {
+      // Skip access instructions, which might be generated for UnsafePointer globals which point to other globals.
+      let clonedOperand = clone(beginAccess.address)
+      bridged.recordFoldedValue(beginAccess.bridged, clonedOperand.bridged)
+      return clonedOperand
+    }
+
     let inst = value.definingInstruction!
+    assert(!(inst is ScopedInstruction), "global init value must not contain a scoped instruction")
+
     for op in inst.operands {
       _ = clone(op.value)
     }

include/swift/SILOptimizer/OptimizerBridging.h

@@ -186,6 +186,7 @@ struct BridgedCloner {
   SWIFT_IMPORT_UNSAFE BridgedValue getClonedValue(BridgedValue v);
   bool isValueCloned(BridgedValue v) const;
   void clone(BridgedInstruction inst);
+  void recordFoldedValue(BridgedValue origValue, BridgedValue mappedValue);
 };
 
 struct BridgedSpecializationCloner {

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -2115,6 +2115,10 @@ void BridgedCloner::clone(BridgedInstruction inst) {
   cloner->cloneInst(inst.unbridged());
 }
 
+void BridgedCloner::recordFoldedValue(BridgedValue origValue, BridgedValue mappedValue) {
+  cloner->recordFoldedValue(origValue.getSILValue(), mappedValue.getSILValue());
+}
+
 static BridgedUtilities::VerifyFunctionFn verifyFunctionFunction;
 
 void BridgedUtilities::registerVerifier(VerifyFunctionFn verifyFunctionFn) {

test/SILOptimizer/simplify_load.sil

@@ -60,6 +60,9 @@ bb0:
   return %1 : $Builtin.RawPointer
 }
 
+sil_global private @global_char : $Int8
+sil_global private [let] @global_pointer : $UnsafeRawPointer
+
 // CHECK-LABEL: sil @load_global_simple
 // CHECK-DAG:     [[L27:%.*]] = integer_literal $Builtin.Int64, 27
 // CHECK-DAG:     [[I27:%.*]] = struct $Int64 ([[L27]] : $Builtin.Int64)
@@ -184,6 +187,35 @@ bb0(%0 : $Builtin.RawPointer):
   return %4 : $(B, Int64)
 }
 
+sil private [global_init_once_fn] @init_global_pointer : $@convention(c) (Builtin.RawPointer) -> () {
+bb0(%0 : $Builtin.RawPointer):
+  alloc_global @global_pointer
+  %2 = global_addr @global_pointer : $*UnsafeRawPointer
+  %3 = global_addr @global_char : $*Int8
+  %4 = begin_access [modify] [dynamic] %3 : $*Int8
+  %5 = address_to_pointer %4 : $*Int8 to $Builtin.RawPointer
+  %6 = struct $UnsafeRawPointer (%5 : $Builtin.RawPointer)
+  end_access %4 : $*Int8
+  store %6 to %2 : $*UnsafeRawPointer
+  %9 = tuple ()
+  return %9 : $()
+}
+
+// CHECK-LABEL: sil @load_global_pointer :
+// CHECK:         %1 = global_addr @global_char
+// CHECK-NEXT:    %2 = address_to_pointer %1 : $*Int8 to $Builtin.RawPointer
+// CHECK-NEXT:    %3 = struct $UnsafeRawPointer (%2 : $Builtin.RawPointer)
+// CHECK-NEXT:    return %3
+// CHECK:       } // end sil function 'load_global_pointer'
+sil @load_global_pointer : $@convention(thin) (Builtin.RawPointer) -> UnsafeRawPointer {
+bb0(%0 : $Builtin.RawPointer):
+  %2 = function_ref @init_global_pointer : $@convention(c) (Builtin.RawPointer) -> ()
+  %3 = builtin "once"(%0 : $Builtin.RawPointer, %2 : $@convention(c) (Builtin.RawPointer) -> ()) : $Builtin.SILToken
+  %4 = global_addr @global_pointer : $*UnsafeRawPointer depends_on %3
+  %5 = load %4 : $*UnsafeRawPointer
+  return %5 : $UnsafeRawPointer
+}
+
 // CHECK-LABEL: sil @load_first_char_from_string_literal
 // CHECK:       bb0:
 // CHECK-NEXT:    %0 = integer_literal $Builtin.Int8, 97