Merge pull request #3153 from FearlessTobi/port-4964

Port citra-emu/citra#4964: "Unfold UNREACHABLE implementation for dumb compilers"
2019-11-24 02:56:12 -05:00
parent e81e0036b4 49e0a30dbd
commit ec8bfe94a7
1 changed files with 3 additions and 2 deletions
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -41,8 +41,9 @@ __declspec(noinline, noreturn)
        }                                                                                          \
    while (0)

-#define UNREACHABLE() ASSERT_MSG(false, "Unreachable code!")
-#define UNREACHABLE_MSG(...) ASSERT_MSG(false, __VA_ARGS__)
+#define UNREACHABLE() assert_noinline_call([] { LOG_CRITICAL(Debug, "Unreachable code!"); })
+#define UNREACHABLE_MSG(...)                                                                       \
+    assert_noinline_call([&] { LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); })

 #ifdef _DEBUG
 #define DEBUG_ASSERT(_a_) ASSERT(_a_)