kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ruby.h: relax rb_funcall check on extra args for clang

Browse source 
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
This commit is contained in:
normal 2018-01-30 23:55:49 +00:00
parent b10b51225e
commit 3ce9a14040
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/-test-/funcall/passing_block.c → ext/-test-/funcall/funcall.c
View file

@ -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);
}

2
include/ruby/ruby.h
View file

@ -1783,6 +1783,8 @@ VALUE rb_check_symbol(volatile VALUE *namep);
# 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)))
# endif

11
test/-ext-/funcall/test_funcall.rb Normal file
View file

@ -0,0 +1,11 @@
# frozen_string_literal: true
require 'test/unit'
class TestFuncall < Test::Unit::TestCase
require '-test-/funcall'
def test_funcall_extra_args
assert_equal 'TestFuncall', TestFuncall.extra_args_name,
'[ruby-core:85266] [Bug #14425]'
end
end