ruby-changes:24995
From: nobu <ko1@a...>
Date: Fri, 28 Sep 2012 17:11:48 +0900 (JST)
Subject: [ruby-changes:24995] nobu:r37047 (trunk): vm_insnhelper.c: fix types
nobu 2012-09-28 17:11:27 +0900 (Fri, 28 Sep 2012) New Revision: 37047 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37047 Log: vm_insnhelper.c: fix types * vm_insnhelper.c (vm_setup_method): fix -Wshorten-64-to-32. * vm_insnhelper.c (vm_base_ptr): fix -Wformat Modified files: trunk/vm_insnhelper.c Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 37046) +++ vm_insnhelper.c (revision 37047) @@ -521,7 +521,7 @@ else { VALUE *src_argv = argv; VALUE *sp_orig; - int src_argc = sp - src_argv; + const int src_argc = iseq->arg_size; VALUE finish_flag = VM_FRAME_TYPE_FINISH_P(cfp) ? VM_FRAME_FLAG_FINISH : 0; cfp = th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); /* pop cf */ @@ -1921,9 +1921,9 @@ #if VM_DEBUG_BP_CHECK if (bp != cfp->bp_check) { - fprintf(stderr, "bp_check: %d, bp: %d\n", - cfp->bp_check - GET_THREAD()->stack, - bp - GET_THREAD()->stack); + fprintf(stderr, "bp_check: %ld, bp: %ld\n", + (long)(cfp->bp_check - GET_THREAD()->stack), + (long)(bp - GET_THREAD()->stack)); rb_bug("vm_base_ptr: unreachable"); } #endif -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/