diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-20 20:11:47 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-20 20:11:47 +0000 |
| commit | 18b6b67233a923b53d46533f8fa5db05e7b2fe71 (patch) | |
| tree | ccbc7d2edafd855b4bfb8e9b9279affaa47bddd9 /ext | |
| parent | c1d4e3fe6440791378470a4177af45f9046d80c7 (diff) | |
merge revision(s) 62116,62151: [Backport #14425]
ruby.h: relax rb_funcall check on extra args for clang
clang 5.+ (tested clang 7.0.0) seems to be attempting division-by-zero
and giving a very large number for static args to rb_funcall.
* include/ruby/ruby.h (rb_varargs_bad_length): relax check for clang
* ext/-test-/funcall/funcall.c: renamed from passing_block.c
define extra_args_name function
* test/-ext-/funcall/test_funcall.rb: new test
[ruby-core:85266] [Bug #14425]
From: Eric Wong <e@80x24.org>
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/branches/ruby_2_5@62501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/-test-/funcall/funcall.c (renamed from ext/-test-/funcall/passing_block.c) | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/ext/-test-/funcall/passing_block.c b/ext/-test-/funcall/funcall.c index 70cb210831..4e13c952e5 100644 --- a/ext/-test-/funcall/passing_block.c +++ b/ext/-test-/funcall/funcall.c @@ -14,10 +14,21 @@ with_funcall_passing_block(int argc, VALUE *argv, VALUE self) return rb_funcall_passing_block(self, rb_intern("target"), argc, argv); } +static VALUE +extra_args_name(VALUE self) +{ + /* + * at least clang 5.x gets tripped by the extra 0 arg + * [ruby-core:85266] [Bug #14425] + */ + return rb_funcall(self, rb_intern("name"), 0, 0); +} + void Init_funcall(void) { - VALUE cRelay = rb_path2class("TestFuncall::Relay"); + VALUE cTestFuncall = rb_path2class("TestFuncall"); + VALUE cRelay = rb_define_module_under(cTestFuncall, "Relay"); rb_define_singleton_method(cRelay, "with_funcall2", @@ -27,4 +38,7 @@ Init_funcall(void) "with_funcall_passing_block", with_funcall_passing_block, -1); + rb_define_singleton_method(cTestFuncall, "extra_args_name", + extra_args_name, + 0); } |