From e2aaed044e9775dde061ecc960b7afabe91e7c6f Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 25 Jul 2021 14:51:32 +0900 Subject: merge revision(s) 292230cbf926e9892596ea37fd4567f0c49ab73c: Fixed leaked global symbols --- gc.c | 14 +++++++++----- vm_insnhelper.c | 7 ++++--- vm_insnhelper.h | 2 +- vm_sync.c | 4 ++-- vm_sync.h | 6 ++++-- 5 files changed, 20 insertions(+), 13 deletions(-) --- vm_insnhelper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 74ab6ac1c6..fc2c7f8fca 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -237,7 +237,7 @@ static bool vm_stack_canary_was_born = false; #ifndef MJIT_HEADER MJIT_FUNC_EXPORTED void -vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) +rb_vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) { const struct rb_control_frame_struct *reg_cfp = ec->cfp; const struct rb_iseq_struct *iseq; @@ -284,6 +284,7 @@ vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) rb_bug("see above."); } #endif +#define vm_check_canary(ec, sp) rb_vm_check_canary(ec, sp) #else #define vm_check_canary(ec, sp) @@ -5377,7 +5378,7 @@ vm_trace(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp) #if VM_CHECK_MODE > 0 NORETURN( NOINLINE( COLDFUNC -void vm_canary_is_found_dead(enum ruby_vminsn_type i, VALUE c))); +void rb_vm_canary_is_found_dead(enum ruby_vminsn_type i, VALUE c))); void Init_vm_stack_canary(void) @@ -5392,7 +5393,7 @@ Init_vm_stack_canary(void) #ifndef MJIT_HEADER MJIT_FUNC_EXPORTED void -vm_canary_is_found_dead(enum ruby_vminsn_type i, VALUE c) +rb_vm_canary_is_found_dead(enum ruby_vminsn_type i, VALUE c) { /* Because a method has already been called, why not call * another one. */ -- cgit v1.2.3