From c2588cb4b19e3d8eef0e145390e672ae43fb033e Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Fri, 25 Aug 2017 00:48:21 +0000 Subject: [PATCH] Fix two (three) more issues with unchecked Error. Summary: If assertions are disabled, but LLVM_ABI_BREAKING_CHANGES is enabled, this will cause an issue with an unchecked Success. Switching to consumeError() is the correct way to bypass the check. This patch also includes disabling 2 tests that can't work without assertions enabled, since llvm_unreachable() with NDEBUG won't crash. Reviewers: llvm-commits, lhames Reviewed By: lhames Subscribers: lhames, pirama Differential Revision: https://reviews.llvm.org/D36729 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@311739 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 +--- unittests/Support/ErrorTest.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h index da02250ba16..c602f1d542f 100644 --- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h @@ -168,10 +168,8 @@ public: void deregisterEHFrames() override { for (auto &Frame : RegisteredEHFrames) { - auto Err = Client.deregisterEHFrames(Frame.Addr, Frame.Size); // FIXME: Add error poll. - assert(!Err && "Failed to register remote EH frames."); - (void)Err; + llvm::cantFail(Client.deregisterEHFrames(Frame.Addr, Frame.Size)); } } diff --git a/unittests/Support/ErrorTest.cpp b/unittests/Support/ErrorTest.cpp index 9f22892374a..852753fbf04 100644 --- a/unittests/Support/ErrorTest.cpp +++ b/unittests/Support/ErrorTest.cpp @@ -483,7 +483,7 @@ TEST(Error, CantFailSuccess) { } // Test that cantFail results in a crash if you pass it a failure value. -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if LLVM_ENABLE_ABI_BREAKING_CHECKS && !defined(NDEBUG) TEST(Error, CantFailDeath) { EXPECT_DEATH( cantFail(make_error("foo", inconvertibleErrorCode())), -- 2.50.1