diff options
| author | Igor Laevsky <igmyrj@gmail.com> | 2015-11-18 14:50:18 +0000 |
|---|---|---|
| committer | Igor Laevsky <igmyrj@gmail.com> | 2015-11-18 14:50:18 +0000 |
| commit | 7310c68e857b8f9f3094695775d7ce3a7708cfe5 (patch) | |
| tree | 34587de514edc2be886c05f9a9c603e55a82a1ae /llvm/lib/Transforms/Utils | |
| parent | 27e67986afb401d8d120c6aa5d69f053a430311f (diff) | |
| download | bcm5719-llvm-7310c68e857b8f9f3094695775d7ce3a7708cfe5.tar.gz bcm5719-llvm-7310c68e857b8f9f3094695775d7ce3a7708cfe5.zip | |
Revert "Revert "Strip metadata when speculatively hoisting instructions (r252604)"
Failing clang test is now fixed by the r253458.
llvm-svn: 253459
Diffstat (limited to 'llvm/lib/Transforms/Utils')
| -rw-r--r-- | llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index e0c598f92e2..ff81e7d5acf 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1618,6 +1618,11 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *ThenBB, SpeculatedStore->setOperand(0, S); } + // Metadata can be dependent on the condition we are hoisting above. + // Conservatively strip all metadata on the instruction. + for (auto &I: *ThenBB) + I.dropUnknownNonDebugMetadata(); + // Hoist the instructions. BB->getInstList().splice(BI->getIterator(), ThenBB->getInstList(), ThenBB->begin(), std::prev(ThenBB->end())); |
