diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2016-06-25 08:19:55 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2016-06-25 08:19:55 +0000 |
| commit | e14e7bc4b889dfaffb7180d176a03311df2d4ae6 (patch) | |
| tree | 625378805831c8775357f4cc7ff0f2eb834a7511 /llvm/lib/Transforms/Utils/InlineFunction.cpp | |
| parent | d346a377375a4780c95f4d30150bdeaed1a35b65 (diff) | |
| download | llvm-e14e7bc4b889dfaffb7180d176a03311df2d4ae6.zip llvm-e14e7bc4b889dfaffb7180d176a03311df2d4ae6.tar.gz llvm-e14e7bc4b889dfaffb7180d176a03311df2d4ae6.tar.bz2 | |
Revert "[SimplifyCFG] Stop inserting calls to llvm.trap for UB"
This reverts commit r273778, it seems to break UBSan :/
llvm-svn: 273779
Diffstat (limited to 'llvm/lib/Transforms/Utils/InlineFunction.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Utils/InlineFunction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp index e4a4da8..a06c849 100644 --- a/llvm/lib/Transforms/Utils/InlineFunction.cpp +++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp @@ -1833,7 +1833,7 @@ bool llvm::InlineFunction(CallSite CS, InlineFunctionInfo &IFI, // As such, we replace the cleanupret with unreachable. if (auto *CleanupRet = dyn_cast<CleanupReturnInst>(BB->getTerminator())) if (CleanupRet->unwindsToCaller() && EHPadForCallUnwindsLocally) - changeToUnreachable(CleanupRet); + changeToUnreachable(CleanupRet, /*UseLLVMTrap=*/false); Instruction *I = BB->getFirstNonPHI(); if (!I->isEHPad()) |