summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-30 23:55:49 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-30 23:55:49 +0000
commit3ce9a14040dae1cc69ddebdeb37e4895ed6adda6 (patch)
treee0a0216a55a9562b891414abebe90ed0ebcb0c02 /ext
parentb10b51225e039ccddd0ae1e68b66f731bfd8e40c (diff)
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> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62116 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 70cb210..4e13c95 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);
}