diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-01 03:55:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-01 03:55:55 +0000 |
| commit | 6eeb0f7ef48c9bc27f7d8508a1b43ae6128fcc96 (patch) | |
| tree | 68401487b2354f686d81c6b60e9f867504f39ae4 /include/ruby | |
| parent | 044e6f12be818d6ba2f1582ec6d6177d442a9512 (diff) | |
ruby.h: relax rb_funcall(obj, id, 0, 0) case only
* include/ruby/ruby.h (rb_varargs_argc_valid_p): relax rb_funcall
check on extra args only if argc == 0, for the compatibility
with wrong code which is probably confused with rb_funcallv.
[Bug #14425]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/ruby.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 372b16891b..6578ffe66d 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1780,17 +1780,19 @@ VALUE rb_check_symbol(volatile VALUE *namep); (((argc) <= (vargc)) ? (argc) : \ (rb_fatal("argc(%d) exceeds actual arguments(%d)", \ argc, vargc), 0)) +# define rb_varargs_argc_valid_p(argc, vargc) \ + ((argc) == 0 ? (vargc) <= 1 : /* [ruby-core:85266] [Bug #14425] */ \ + (argc) == (vargc)) # if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) # if HAVE_ATTRIBUTE_ERRORFUNC ERRORFUNC((" argument length doesn't match"), int rb_varargs_bad_length(int,int)); -# elif defined(__clang__) /* [ruby-core:85266] [Bug #14425] */ -# define rb_varargs_bad_length(argc, vargc) ((argc)/((argc) <= (vargc))) # else -# define rb_varargs_bad_length(argc, vargc) ((argc)/((argc) == (vargc))) +# define rb_varargs_bad_length(argc, vargc) \ + ((argc)/rb_varargs_argc_valid_p(argc, vargc)) # endif # define rb_varargs_argc_check(argc, vargc) \ __builtin_choose_expr(__builtin_constant_p(argc), \ - (((argc) == (vargc)) ? (argc) : \ + (rb_varargs_argc_valid_p(argc, vargc) ? (argc) : \ rb_varargs_bad_length(argc, vargc)), \ rb_varargs_argc_check_runtime(argc, vargc)) # else |