[CallGraph] Don't preserve CallGraph when function CFG analyses are preserved

aeubanks · aeubanks · commit 6dd17a2b3403 · 2022-06-19T13:01:08.000-07:00
The call graph has nothing to with function CFGs.

Fixes a crash in a future change that exposes this bug.
diff --git a/llvm/lib/Analysis/CallGraph.cpp b/llvm/lib/Analysis/CallGraph.cpp
@@ -69,8 +69,7 @@ bool CallGraph::invalidate(Module &, const PreservedAnalyses &PA,
   // Check whether the analysis, all analyses on functions, or the function's
   // CFG have been preserved.
   auto PAC = PA.getChecker<CallGraphAnalysis>();
-  return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Module>>() ||
-           PAC.preservedSet<CFGAnalyses>());
+  return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Module>>());
 }
 
 void CallGraph::addToCallGraph(Function *F) {

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ bool CallGraph::invalidate(Module &, const PreservedAnalyses &PA,`
`69`	`69`	`// Check whether the analysis, all analyses on functions, or the function's`
`70`	`70`	`// CFG have been preserved.`
`71`	`71`	`auto PAC = PA.getChecker<CallGraphAnalysis>();`
`72`		`- return !(PAC.preserved() \|\| PAC.preservedSet<AllAnalysesOn<Module>>() \|\|`
`73`		`- PAC.preservedSet<CFGAnalyses>());`
	`72`	`+ return !(PAC.preserved() \|\| PAC.preservedSet<AllAnalysesOn<Module>>());`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`void CallGraph::addToCallGraph(Function *F) {`