aboutsummaryrefslogtreecommitdiffstats
path: root/include
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
commitfeb74b374dfdb9da7df378470cff4dafb209f96a (patch)
treee0a0216a55a9562b891414abebe90ed0ebcb0c02 /include
parent4fc3c8e149178162f14e96a549ef22d5aeee4f42 (diff)
downloadruby-feb74b374dfdb9da7df378470cff4dafb209f96a.tar.gz
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 'include')
-rw-r--r--include/ruby/ruby.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index bd635f3b7c..372b16891b 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -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