Fix possible iterator invalidation in SILMem2Reg

meg-gupta · meg-gupta · commit f99eb1df267a · 2022-06-21T14:22:26.000-07:00
diff --git a/lib/SILOptimizer/Transforms/SILMem2Reg.cpp b/lib/SILOptimizer/Transforms/SILMem2Reg.cpp
@@ -291,7 +291,7 @@ replaceLoad(SILInstruction *inst, SILValue newValue, AllocStackInst *asi,
         endBorrows.push_back(ebi);
       }
       for (auto *ebi : endBorrows) {
-        ebi->eraseFromParent();
+        prepareForDeletion(ebi, instructionsToDelete);
       }
       lbi->replaceAllUsesWith(newValue);
     }

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ replaceLoad(SILInstruction inst, SILValue newValue, AllocStackInst asi,`
`291`	`291`	`endBorrows.push_back(ebi);`
`292`	`292`	`}`
`293`	`293`	`for (auto *ebi : endBorrows) {`
`294`		`- ebi->eraseFromParent();`
	`294`	`+ prepareForDeletion(ebi, instructionsToDelete);`
`295`	`295`	`}`
`296`	`296`	`lbi->replaceAllUsesWith(newValue);`
`297`	`297`	`}`