summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-25 06:00:14 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-25 06:00:14 +0000
commitfeda4813dcbe90b7adef7bcf1e382a657c1f4245 (patch)
treee1fb7d2a5ea4233d38f091dd6af6f8cac69b5b77
parent4d277f769964d30b1979d0a4e1d98ce507d57f01 (diff)
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
-rw-r--r--vm_insnhelper.c5
1 files changed, 1 insertions, 4 deletions
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;