From: Sanjoy Das Date: Sun, 26 Jun 2016 04:55:23 +0000 (+0000) Subject: [RSForGC] Bring recomputeLiveInValues up to code; NFC X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52dba4b5a5f5a26742cc0c9f31515727f68fafb4;p=llvm [RSForGC] Bring recomputeLiveInValues up to code; NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@273796 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp b/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp index 7995dab977e..501aad73214 100644 --- a/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp +++ b/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp @@ -2566,32 +2566,32 @@ static void recomputeLiveInValues(GCPtrLivenessData &RevisedLivenessData, #ifndef NDEBUG DenseSet Bases; - for (auto KVPair : Info.PointerToBase) { + for (auto KVPair : Info.PointerToBase) Bases.insert(KVPair.second); - } #endif + // We may have base pointers which are now live that weren't before. We need // to update the PointerToBase structure to reflect this. for (auto V : Updated) - if (Info.PointerToBase.insert(std::make_pair(V, V)).second) { - assert(Bases.count(V) && "can't find base for unexpected live value"); + if (Info.PointerToBase.insert({V, V}).second) { + assert(Bases.count(V) && "Can't find base for unexpected live value!"); continue; } #ifndef NDEBUG - for (auto V : Updated) { + for (auto V : Updated) assert(Info.PointerToBase.count(V) && - "must be able to find base for live value"); - } + "Must be able to find base for live value!"); #endif // Remove any stale base mappings - this can happen since our liveness is - // more precise then the one inherent in the base pointer analysis + // more precise then the one inherent in the base pointer analysis. DenseSet ToErase; for (auto KVPair : Info.PointerToBase) if (!Updated.count(KVPair.first)) ToErase.insert(KVPair.first); - for (auto V : ToErase) + + for (auto *V : ToErase) Info.PointerToBase.erase(V); #ifndef NDEBUG