From feda4813dcbe90b7adef7bcf1e382a657c1f4245 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 25 Dec 2018 06:00:14 +0000 Subject: merge revision(s) 66538: vm_insnhelper.c: use COLDFUNC COLDFUNC is introduced in r66228. Use it for pre-existing __attribute__((__cold__)) usages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 6c09827b83..4f39a0f5a3 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3941,10 +3941,7 @@ vm_trace(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE *p } #if VM_CHECK_MODE > 0 -static NORETURN( NOINLINE( -#if GCC_VERSION_SINCE(4, 3, 0) -__attribute__((__cold__)) -#endif +static NORETURN( NOINLINE( COLDFUNC void vm_canary_is_found_dead(enum ruby_vminsn_type i, VALUE c))); static VALUE vm_stack_canary; -- cgit v1.2.3