[llvm] r366215 - [ADCE] Fix non-deterministic behaviour due to iterating over a pointer set.
Amara Emerson via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 16 08:23:11 PDT 2019
Author: aemerson
Date: Tue Jul 16 08:23:10 2019
New Revision: 366215
URL: http://llvm.org/viewvc/llvm-project?rev=366215&view=rev
Log:
[ADCE] Fix non-deterministic behaviour due to iterating over a pointer set.
Original patch by Yann Laigle-Chapuy
Differential Revision: https://reviews.llvm.org/D64785
Modified:
llvm/trunk/lib/Transforms/Scalar/ADCE.cpp
Modified: llvm/trunk/lib/Transforms/Scalar/ADCE.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/ADCE.cpp?rev=366215&r1=366214&r2=366215&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/ADCE.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/ADCE.cpp Tue Jul 16 08:23:10 2019
@@ -19,6 +19,7 @@
#include "llvm/ADT/GraphTraits.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
@@ -135,7 +136,7 @@ class AggressiveDeadCodeElimination {
SmallPtrSet<const Metadata *, 32> AliveScopes;
/// Set of blocks with not known to have live terminators.
- SmallPtrSet<BasicBlock *, 16> BlocksWithDeadTerminators;
+ SmallSetVector<BasicBlock *, 16> BlocksWithDeadTerminators;
/// The set of blocks which we have determined whose control
/// dependence sources must be live and which have not had
@@ -389,7 +390,7 @@ void AggressiveDeadCodeElimination::mark
// Mark the containing block live
auto &BBInfo = *Info.Block;
if (BBInfo.Terminator == I) {
- BlocksWithDeadTerminators.erase(BBInfo.BB);
+ BlocksWithDeadTerminators.remove(BBInfo.BB);
// For live terminators, mark destination blocks
// live to preserve this control flow edges.
if (!BBInfo.UnconditionalBranch)
@@ -478,10 +479,14 @@ void AggressiveDeadCodeElimination::mark
// which currently have dead terminators that are control
// dependence sources of a block which is in NewLiveBlocks.
+ const SmallPtrSet<BasicBlock *, 16> BWDT{
+ BlocksWithDeadTerminators.begin(),
+ BlocksWithDeadTerminators.end()
+ };
SmallVector<BasicBlock *, 32> IDFBlocks;
ReverseIDFCalculator IDFs(PDT);
IDFs.setDefiningBlocks(NewLiveBlocks);
- IDFs.setLiveInBlocks(BlocksWithDeadTerminators);
+ IDFs.setLiveInBlocks(BWDT);
IDFs.calculate(IDFBlocks);
NewLiveBlocks.clear();
More information about the llvm-commits
mailing list