summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-07-15 11:00:16 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-07-15 11:01:53 +0900
commita7fdb22373442bb25e687a8f2df36fb5b85d2846 (patch)
treebea64e8136062a5bb9d642036013ab3a18b19c3b /include
parent05cc87df1b5f7a125e24d64058d9ad1f75cdfd3f (diff)
Enable RUBY_ASSERT_MESG_WHEN when RUBY_DEBUG is turned on
Diffstat (limited to 'include')
-rw-r--r--include/ruby/assert.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/ruby/assert.h b/include/ruby/assert.h
index a5ee396f6b..d19d8e4e32 100644
--- a/include/ruby/assert.h
+++ b/include/ruby/assert.h
@@ -20,15 +20,16 @@ NORETURN(void rb_assert_failure(const char *, int, const char *, const char *));
((expr) ? (void)0 : RUBY_ASSERT_FAIL(mesg))
#ifdef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
# define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) \
+ ((RUBY_DEBUG+0) ? RUBY_ASSERT_MESG((expr), mesg) : \
__builtin_choose_expr( \
__builtin_constant_p(cond), \
__builtin_choose_expr(cond, RUBY_ASSERT_MESG(expr, mesg), (void)0), \
- RUBY_ASSERT_MESG(!(cond) || (expr), mesg))
+ RUBY_ASSERT_MESG(!(cond) || (expr), mesg)))
#else
# define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) \
- RUBY_ASSERT_MESG(!(cond) || (expr), mesg)
+ RUBY_ASSERT_MESG(!((RUBY_DEBUG+0) || (cond)) || (expr), mesg)
#endif
-#define RUBY_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(RUBY_DEBUG+(!RUBY_NDEBUG+0), expr, #expr)
+#define RUBY_ASSERT(expr) RUBY_ASSERT_MESG_WHEN((!RUBY_NDEBUG+0), expr, #expr)
#define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN(cond, expr, #expr)
#define RUBY_ASSERT_ALWAYS(expr) RUBY_ASSERT_MESG_WHEN(TRUE, expr, #expr)