ruby-changes:56809
From: Nobuyoshi <ko1@a...>
Date: Mon, 5 Aug 2019 09:00:13 +0900 (JST)
Subject: [ruby-changes:56809] Nobuyoshi Nakada: d6ac5c53d4 (master): Revert "Always evaluate the expression RUBY_ASSERT_MESG_WHEN just once"
https://git.ruby-lang.org/ruby.git/commit/?id=d6ac5c53d4 From d6ac5c53d481b109cb684d818b14ff24afb5b4bb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Mon, 5 Aug 2019 08:55:09 +0900 Subject: Revert "Always evaluate the expression RUBY_ASSERT_MESG_WHEN just once" It caused a significant benchmark fall. Some assertions seem to use expressions with side-effects which cannot be inlined. This reverts commit b452c03a14f943ae25338547bd680fce67399d85. diff --git a/include/ruby/assert.h b/include/ruby/assert.h index bdc0234..d19d8e4 100644 --- a/include/ruby/assert.h +++ b/include/ruby/assert.h @@ -23,7 +23,7 @@ NORETURN(void rb_assert_failure(const char *, int, const char *, const char *)); https://github.com/ruby/ruby/blob/trunk/include/ruby/assert.h#L23 ((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)(expr)), \ + __builtin_choose_expr(cond, RUBY_ASSERT_MESG(expr, mesg), (void)0), \ RUBY_ASSERT_MESG(!(cond) || (expr), mesg))) #else # define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) \ -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/