Merge commit '1256ca04c206' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 1727af2ccc4b · 2025-04-16T00:36:36.000-07:00
diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp
@@ -1014,9 +1014,7 @@ void MachineFunction::eraseAdditionalCallInfo(const MachineInstr *MI) {
   if (CSIt != CallSitesInfo.end())
     CallSitesInfo.erase(CSIt);
 
-  CalledGlobalsMap::iterator CGIt = CalledGlobalsInfo.find(CallMI);
-  if (CGIt != CalledGlobalsInfo.end())
-    CalledGlobalsInfo.erase(CGIt);
+  CalledGlobalsInfo.erase(CallMI);
 }
 
 void MachineFunction::copyAdditionalCallInfo(const MachineInstr *Old,

Original file line number	Diff line number	Diff line change
`@@ -1014,9 +1014,7 @@ void MachineFunction::eraseAdditionalCallInfo(const MachineInstr *MI) {`
`1014`	`1014`	`if (CSIt != CallSitesInfo.end())`
`1015`	`1015`	`CallSitesInfo.erase(CSIt);`
`1016`	`1016`
`1017`		`- CalledGlobalsMap::iterator CGIt = CalledGlobalsInfo.find(CallMI);`
`1018`		`- if (CGIt != CalledGlobalsInfo.end())`
`1019`		`- CalledGlobalsInfo.erase(CGIt);`
	`1017`	`+ CalledGlobalsInfo.erase(CallMI);`
`1020`	`1018`	`}`
`1021`	`1019`
`1022`	`1020`	`void MachineFunction::copyAdditionalCallInfo(const MachineInstr *Old,`