naruse	2018-12-25 15:00:14 +0900 (Tue, 25 Dec 2018)

  New Revision: 66544

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66544

  Log:
    merge revision(s) 66538:
    
    vm_insnhelper.c: use COLDFUNC
    
    COLDFUNC is introduced in r66228.  Use it for pre-existing
    __attribute__((__cold__)) usages.

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/vm_insnhelper.c
Index: ruby_2_6/vm_insnhelper.c
===================================================================
--- ruby_2_6/vm_insnhelper.c	(revision 66543)
+++ ruby_2_6/vm_insnhelper.c	(revision 66544)
@@ -3941,10 +3941,7 @@ vm_trace(rb_execution_context_t *ec, rb_ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/vm_insnhelper.c#L3941
 }
 
 #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;
 
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66543)
+++ ruby_2_6	(revision 66544)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66538

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/