Fix licm handling of unreferenceable storage.

MAJKFL · MAJKFL · commit bab00113b29d · 2025-08-29T12:46:27.000+01:00
diff --git a/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LoopInvariantCodeMotion.swift b/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LoopInvariantCodeMotion.swift
@@ -587,10 +587,13 @@ private extension AnalyzedInstructions {
         continue
       }
 
-      if let splitLoads = loadInst.trySplit(alongPath: accessPath.projectionPath, context) {
-        splitCounter += splitLoads.count
-        newLoads.append(contentsOf: splitLoads)
+      guard let splitLoads = loadInst.trySplit(alongPath: accessPath.projectionPath, context) else {
+        newLoads.push(loadInst)
+        return false
       }
+      
+      splitCounter += splitLoads.count
+      newLoads.append(contentsOf: splitLoads)
     }
 
     return true
diff --git a/test/SILOptimizer/high_level_licm.sil b/test/SILOptimizer/high_level_licm.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-sil-verify-all %s -high-level-licm | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all %s -loop-invariant-code-motion | %FileCheck %s
 
 sil_stage canonical
 
diff --git a/test/SILOptimizer/licm_unreferenceablestorage.sil b/test/SILOptimizer/licm_unreferenceablestorage.sil
@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-print-types -enable-sil-verify-all %s -licm | %FileCheck %s
+// RUN: %target-sil-opt -sil-print-types -enable-sil-verify-all %s -loop-invariant-code-motion | %FileCheck %s
 
 // REQUIRES: objc_interop
 

Original file line number	Diff line number	Diff line change
`@@ -587,10 +587,13 @@ private extension AnalyzedInstructions {`
`587`	`587`	`continue`
`588`	`588`	`}`
`589`	`589`
`590`		`- if let splitLoads = loadInst.trySplit(alongPath: accessPath.projectionPath, context) {`
`591`		`- splitCounter += splitLoads.count`
`592`		`- newLoads.append(contentsOf: splitLoads)`
	`590`	`+ guard let splitLoads = loadInst.trySplit(alongPath: accessPath.projectionPath, context) else {`
	`591`	`+ newLoads.push(loadInst)`
	`592`	`+ return false`
`593`	`593`	`}`
	`594`	`+`
	`595`	`+ splitCounter += splitLoads.count`
	`596`	`+ newLoads.append(contentsOf: splitLoads)`
`594`	`597`	`}`
`595`	`598`
`596`	`599`	`return true`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-sil-opt -enable-sil-verify-all %s -high-level-licm \| %FileCheck %s`
	`1`	`+// RUN: %target-sil-opt -enable-sil-verify-all %s -loop-invariant-code-motion \| %FileCheck %s`
`2`	`2`
`3`	`3`	`sil_stage canonical`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-sil-opt -sil-print-types -enable-sil-verify-all %s -licm \| %FileCheck %s`
	`1`	`+// RUN: %target-sil-opt -sil-print-types -enable-sil-verify-all %s -loop-invariant-code-motion \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: objc_interop`
`4`	`4`