Merge pull request swiftlang#78970 from eeckstein/fix-is-deinit-barrier

eeckstein · web-flow · commit 649072bdb84c · 2025-01-28T13:13:38.000+01:00
BasicCalleeAnalysis: don't crash if the `bca` argument to `isDeinitBarrier` is null
diff --git a/lib/SILOptimizer/Analysis/BasicCalleeAnalysis.cpp b/lib/SILOptimizer/Analysis/BasicCalleeAnalysis.cpp
@@ -75,7 +75,7 @@ getMemoryBehavior(FullApplySite as, bool observeRetains) {
 
 bool swift::isDeinitBarrier(SILInstruction *const instruction,
                             BasicCalleeAnalysis *bca) {
-  if (!instructionIsDeinitBarrierFunction) {
+  if (!instructionIsDeinitBarrierFunction || !bca) {
     return mayBeDeinitBarrierNotConsideringSideEffects(instruction);
   }
   BridgedInstruction inst = {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ getMemoryBehavior(FullApplySite as, bool observeRetains) {`
`75`	`75`
`76`	`76`	`bool swift::isDeinitBarrier(SILInstruction *const instruction,`
`77`	`77`	`BasicCalleeAnalysis *bca) {`
`78`		`- if (!instructionIsDeinitBarrierFunction) {`
	`78`	`+ if (!instructionIsDeinitBarrierFunction \|\| !bca) {`
`79`	`79`	`return mayBeDeinitBarrierNotConsideringSideEffects(instruction);`
`80`	`80`	`}`
`81`	`81`	`BridgedInstruction inst = {`