summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
author卜部昌平 <shyouhei@ruby-lang.org>2019-09-04 15:55:02 +0900
committer卜部昌平 <shyouhei@ruby-lang.org>2019-09-05 12:13:07 +0900
commitdd2b9d4a96e6c9784daf645efc79bef11eb1decb (patch)
treeb2b0ac62e5a2186c3f6396f57b53bac0ec487893 /include
parentb005d7c2e208790b89b332d5f8ca56334039d6ae (diff)
hide rb_funcallv_with_cc from public
Requested by ko1. Also, because now that this function is internal use only, why not just directly use struct rb_call_cache to purge the ZALLOC.
Diffstat (limited to 'include')
-rw-r--r--include/ruby/ruby.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 67ef3f4df2..947b3d44b8 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1892,10 +1892,6 @@ VALUE rb_funcallv_public(VALUE, ID, int, const VALUE*);
#define rb_funcall3 rb_funcallv_public
VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
VALUE rb_funcall_with_block(VALUE, ID, int, const VALUE*, VALUE);
-#if GCC_VERSION_SINCE(3, 3, 0)
-__attribute__((__nonnull__ (1))) /* TODO: should check using configure */
-#endif
-VALUE rb_funcallv_with_cc(void**, VALUE, ID, int, const VALUE*);
int rb_scan_args(int, const VALUE*, const char*, ...);
VALUE rb_call_super(int, const VALUE*);
VALUE rb_current_receiver(void);
@@ -2611,19 +2607,10 @@ __extension__({ \
const VALUE rb_funcall_args[] = {__VA_ARGS__}; \
const int rb_funcall_nargs = \
(int)(sizeof(rb_funcall_args) / sizeof(VALUE)); \
- static void *rb_funcall_opaque_cc = NULL; \
- rb_funcallv_with_cc(&rb_funcall_opaque_cc, \
- recv, mid, \
+ rb_funcallv(recv, mid, \
rb_varargs_argc_check(rb_funcall_argc, rb_funcall_nargs), \
rb_funcall_nargs ? rb_funcall_args : NULL); \
})
-
-# define rb_funcallv(recv, mid, argc, argv) \
-__extension__({ \
- static void *rb_funcallv_opaque_cc = NULL; \
- rb_funcallv_with_cc(&rb_funcallv_opaque_cc, \
- recv, mid, argc,argv); \
- })
#endif
#ifndef RUBY_DONT_SUBST