From 04a03b34c3b5320c23d9e78f4acc884370e01bb1 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 24 May 2012 09:51:20 +0000 Subject: vm.c: suppress 64-to-32 warnings * vm.c (backtrace_object): suppress 64-to-32 warnings. should adjust types. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++------ vm.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6787a6c653..a416473f4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ Thu May 24 15:33:01 2012 Koichi Sasada Thu May 24 14:30:13 2012 Koichi Sasada * vm.c: add RubyVM::Backtrace object (btobj). - Backtrace information contains an array consists of location + Backtrace information contains an array consists of location information for each frames by string. RubyVM::Backtrace object is lightweight backtrace information, which contains complete information to generate traditional style @@ -32,11 +32,11 @@ Thu May 24 14:30:13 2012 Koichi Sasada * test/ruby/test_settracefunc.rb: fix for above change. - * vm_method.c (rb_method_defined_by): added. This function + * vm_method.c (rb_method_defined_by): added. This function checks that the given object responds with the given method by the given cfunc. - * benchmark/bm_vm2_raise1.rb, benchmark/bm_vm2_raise2.rb: + * benchmark/bm_vm2_raise1.rb, benchmark/bm_vm2_raise2.rb: add to measure exception creation speed. raise1 create exception objects from shallow stack frame. raise2 create exception objects from deep stack frame. @@ -343,7 +343,7 @@ Thu May 17 10:54:58 2012 Nobuyoshi Nakada Wed May 16 15:44:22 2012 Yuki Yugui Sonoda * configure.in: Fix an unbalanced quote. - + Wed May 16 15:43:10 2012 NAKAMURA Usaku * ext/extmk.rb (exts.mk): use double quotes instead of single quotes @@ -567,7 +567,7 @@ Wed May 9 06:23:33 2012 Tadayoshi Funaba Wed May 9 04:31:26 2012 Masatoshi SEKI - * lib/rinda/ring.rb (lookup_ring_any): fix Rinda::RingFinger.primary + * lib/rinda/ring.rb (lookup_ring_any): fix Rinda::RingFinger.primary hungs forever. [ruby-talk:395364] Tue May 8 21:09:00 2012 Hiroshi Shirosaki @@ -742,7 +742,7 @@ Mon May 7 10:16:30 2012 Nobuyoshi Nakada Mon May 07 09:14:11 2012 Martin Bosslet - * ext/openssl/ossl_ssl.c: support TLSv1.1 & TLSv1.2. Add + * ext/openssl/ossl_ssl.c: support TLSv1.1 & TLSv1.2. Add SSLContext#version to inspect the version that was negotiated for a given connection. * ext/openssl/extconf.rb: detect TLS 1.1 & 1.2 support. diff --git a/vm.c b/vm.c index 0898deac92..93e5f2a01a 100644 --- a/vm.c +++ b/vm.c @@ -897,7 +897,7 @@ backtrace_object(rb_thread_t *th, int lev, int n) start_cfp = RUBY_VM_NEXT_CONTROL_FRAME( RUBY_VM_NEXT_CONTROL_FRAME( RUBY_VM_NEXT_CONTROL_FRAME(start_cfp))); /* skip top frames */ - size = (start_cfp - last_cfp) + 1; + size = (int)(start_cfp - last_cfp) + 1; /* TODO: check overflow */ if (n <= 0) { n = size + n; @@ -1024,7 +1024,7 @@ vm_backtrace_each(rb_thread_t *th, int lev, int n, void (*init)(void *), rb_back int line_no = 0; if (n <= 0) { - n = cfp - limit_cfp; + n = (int)(cfp - limit_cfp); /* TODO: check overflow */ } cfp -= 2; -- cgit v1.2.3