From: Johannes Doerfert <johannes@jdoerfert.de>
Date: Thu, 9 Apr 2020 20:43:31 +0000 (-0500)
Subject: [CallGraphUpdater][NFC] Minor updates to D77855
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df675890b7633ae8677b86be8a47ac21deb8b669;p=platform%2Fupstream%2Fllvm.git

[CallGraphUpdater][NFC] Minor updates to D77855

I uploaded the old version accidentally instead of the one with these
minor adjustments requested by the reviewers.

Differential Revision: https://reviews.llvm.org/D77855
---

diff --git a/llvm/lib/Analysis/CallGraphSCCPass.cpp b/llvm/lib/Analysis/CallGraphSCCPass.cpp
index 8a222a6..79fa372 100644
--- a/llvm/lib/Analysis/CallGraphSCCPass.cpp
+++ b/llvm/lib/Analysis/CallGraphSCCPass.cpp
@@ -563,7 +563,7 @@ void CallGraphSCC::ReplaceNode(CallGraphNode *Old, CallGraphNode *New) {
 }
 
 void CallGraphSCC::DeleteNode(CallGraphNode *Old) {
-  ReplaceNode(Old, /* New */ nullptr);
+  ReplaceNode(Old, /*New=*/nullptr);
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Transforms/Utils/CallGraphUpdater.cpp b/llvm/lib/Transforms/Utils/CallGraphUpdater.cpp
index 219c46d..8cdf01e 100644
--- a/llvm/lib/Transforms/Utils/CallGraphUpdater.cpp
+++ b/llvm/lib/Transforms/Utils/CallGraphUpdater.cpp
@@ -112,7 +112,7 @@ void CallGraphUpdater::removeFunction(Function &DeadFn) {
     DeadFunctions.push_back(&DeadFn);
 
   // For the old call graph we remove the function from the SCC right away.
-  if (CGSCC && !ReplacedFunctions.count(&DeadFn))
+  if (CG && !ReplacedFunctions.count(&DeadFn))
     CGSCC->DeleteNode((*CG)[&DeadFn]);
 }