diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2011-06-14 15:31:54 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2011-06-14 15:31:54 +0000 |
| commit | 3aeaf9e4c1d2167d3f9ba2a9415914e3dde8bb95 (patch) | |
| tree | 555d3cb7bb5cc822aaf331f22fc26cdf866081d5 /llvm/lib/CodeGen/BranchFolding.h | |
| parent | c6a998712dd09a1385fa5161a374db091a0b91c9 (diff) | |
| download | bcm5719-llvm-3aeaf9e4c1d2167d3f9ba2a9415914e3dde8bb95.tar.gz bcm5719-llvm-3aeaf9e4c1d2167d3f9ba2a9415914e3dde8bb95.zip | |
Add 132986 back, but avoid non-determinism if a bb address gets reused.
llvm-svn: 132995
Diffstat (limited to 'llvm/lib/CodeGen/BranchFolding.h')
| -rw-r--r-- | llvm/lib/CodeGen/BranchFolding.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/BranchFolding.h b/llvm/lib/CodeGen/BranchFolding.h index 4daf4ecfe59..4ed42c03464 100644 --- a/llvm/lib/CodeGen/BranchFolding.h +++ b/llvm/lib/CodeGen/BranchFolding.h @@ -10,6 +10,7 @@ #ifndef LLVM_CODEGEN_BRANCHFOLDING_HPP #define LLVM_CODEGEN_BRANCHFOLDING_HPP +#include "llvm/ADT/SmallPtrSet.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include <vector> @@ -47,6 +48,7 @@ namespace llvm { }; typedef std::vector<MergePotentialsElt>::iterator MPIterator; std::vector<MergePotentialsElt> MergePotentials; + SmallPtrSet<const MachineBasicBlock*, 2> TriedMerging; class SameTailElt { MPIterator MPIter; |
