normal	2017-05-09 15:17:01 +0900 (Tue, 09 May 2017)

  New Revision: 58615

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

  Log:
    fixup r58614 for raspi3 and maybe other systems with odd compile
    
    [ruby-core:81048]

  Modified files:
    trunk/vm.c
    trunk/vm_insnhelper.c
    trunk/vm_insnhelper.h
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 58614)
+++ vm_insnhelper.c	(revision 58615)
@@ -1428,8 +1428,8 @@ vm_base_ptr(const rb_control_frame_t *cf https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1428
 #if VM_DEBUG_BP_CHECK
 	if (bp != cfp->bp_check) {
 	    fprintf(stderr, "bp_check: %ld, bp: %ld\n",
-		    (long)(cfp->bp_check - GET_THREAD()->stack),
-		    (long)(bp - GET_THREAD()->stack));
+		    (long)(cfp->bp_check - GET_THREAD()->ec.stack),
+		    (long)(bp - GET_THREAD()->ec.stack));
 	    rb_bug("vm_base_ptr: unreachable");
 	}
 #endif
Index: vm_insnhelper.h
===================================================================
--- vm_insnhelper.h	(revision 58614)
+++ vm_insnhelper.h	(revision 58615)
@@ -47,7 +47,7 @@ extern VALUE ruby_vm_const_missing_count https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.h#L47
 #define VM_REG_EP  (VM_REG_CFP->ep)
 
 #define RESTORE_REGS() do { \
-    VM_REG_CFP = th->cfp; \
+    VM_REG_CFP = th->ec.cfp; \
 } while (0)
 
 #define REG_A   reg_a
Index: vm.c
===================================================================
--- vm.c	(revision 58614)
+++ vm.c	(revision 58615)
@@ -3266,7 +3266,7 @@ vm_analysis_operand(int insn, int n, VAL https://github.com/ruby/ruby/blob/trunk/vm.c#L3266
 	HASH_ASET(ihash, INT2FIX(n), ophash);
     }
     /* intern */
-    valstr = rb_insn_operand_intern(GET_THREAD()->cfp->iseq, insn, n, op, 0, 0, 0, 0);
+    valstr = rb_insn_operand_intern(GET_THREAD()->ec.cfp->iseq, insn, n, op, 0, 0, 0, 0);
 
     /* set count */
     if ((cv = rb_hash_aref(ophash, valstr)) == Qnil) {
@@ -3379,7 +3379,7 @@ vm_collect_usage_operand(int insn, int n https://github.com/ruby/ruby/blob/trunk/vm.c#L3379
     if (RUBY_DTRACE_INSN_OPERAND_ENABLED()) {
 	VALUE valstr;
 
-	valstr = rb_insn_operand_intern(GET_THREAD()->cfp->iseq, insn, n, op, 0, 0, 0, 0);
+	valstr = rb_insn_operand_intern(GET_THREAD()->ec.cfp->iseq, insn, n, op, 0, 0, 0, 0);
 
 	RUBY_DTRACE_INSN_OPERAND(RSTRING_PTR(valstr), rb_insns_name(insn));
 	RB_GC_GUARD(valstr);

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