kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm_backtrace.c: use long

Browse source 
* vm_backtrace.c (rb_debug_inspector_frame_{class,binding,iseq}_get):
  use long as index as well as RARRAY_LEN().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-28 09:02:19 +00:00
parent 43ce5ce1b4
commit 616f2c43c6
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Mon Jan 28 18:02:16 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_backtrace.c (rb_debug_inspector_frame_{class,binding,iseq}_get):
use long as index as well as RARRAY_LEN().
Mon Jan 28 17:58:44 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_backtrace.c (rb_debug_inspector_frame_{class,binding,iseq}_get):
use long as index as well as RARRAY_LEN().
Mon Jan 28 17:51:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jan 28 17:51:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/envutil.rb (assert_separately): imply no core dump. * test/ruby/envutil.rb (assert_separately): imply no core dump.

6
include/ruby/debug.h
View file

@ -31,9 +31,9 @@ typedef struct rb_debug_inspector_struct rb_debug_inspector_t;
typedef VALUE (*rb_debug_inspector_func_t)(const rb_debug_inspector_t *, void *); typedef VALUE (*rb_debug_inspector_func_t)(const rb_debug_inspector_t *, void *);
VALUE rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data); VALUE rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data);
VALUE rb_debug_inspector_frame_binding_get(const rb_debug_inspector_t *dc, int index); VALUE rb_debug_inspector_frame_binding_get(const rb_debug_inspector_t *dc, long index);
VALUE rb_debug_inspector_frame_class_get(const rb_debug_inspector_t *dc, int index); VALUE rb_debug_inspector_frame_class_get(const rb_debug_inspector_t *dc, long index);
VALUE rb_debug_inspector_frame_iseq_get(const rb_debug_inspector_t *dc, int index); VALUE rb_debug_inspector_frame_iseq_get(const rb_debug_inspector_t *dc, long index);
VALUE rb_debug_inspector_backtrace_locations(const rb_debug_inspector_t *dc); VALUE rb_debug_inspector_backtrace_locations(const rb_debug_inspector_t *dc);
/* Old style set_trace_func APIs */ /* Old style set_trace_func APIs */

12
vm_backtrace.c
View file

@ -1009,7 +1009,7 @@ struct rb_debug_inspector_struct {
rb_control_frame_t *cfp; rb_control_frame_t *cfp;
VALUE backtrace; VALUE backtrace;
VALUE contexts; /* [[klass, binding, iseq, cfp], ...] */ VALUE contexts; /* [[klass, binding, iseq, cfp], ...] */
int backtrace_size; long backtrace_size;
}; };
struct collect_caller_bindings_data { struct collect_caller_bindings_data {
@ -1072,7 +1072,7 @@ rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data)
dbg_context.th = th; dbg_context.th = th;
dbg_context.cfp = dbg_context.th->cfp; dbg_context.cfp = dbg_context.th->cfp;
dbg_context.backtrace = vm_backtrace_location_ary(th, 0, 0); dbg_context.backtrace = vm_backtrace_location_ary(th, 0, 0);
dbg_context.backtrace_size = RARRAY_LENINT(dbg_context.backtrace); dbg_context.backtrace_size = RARRAY_LEN(dbg_context.backtrace);
dbg_context.contexts = collect_caller_bindings(th); dbg_context.contexts = collect_caller_bindings(th);
TH_PUSH_TAG(th); TH_PUSH_TAG(th);
@ -1091,7 +1091,7 @@ rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data)
} }
static VALUE static VALUE
frame_get(const rb_debug_inspector_t *dc, int index) frame_get(const rb_debug_inspector_t *dc, long index)
{ {
if (index < 0 || index >= dc->backtrace_size) { if (index < 0 || index >= dc->backtrace_size) {
rb_raise(rb_eArgError, "no such frame"); rb_raise(rb_eArgError, "no such frame");
@ -1100,21 +1100,21 @@ frame_get(const rb_debug_inspector_t *dc, int index)
} }
VALUE VALUE
rb_debug_inspector_frame_class_get(const rb_debug_inspector_t *dc, int index) rb_debug_inspector_frame_class_get(const rb_debug_inspector_t *dc, long index)
{ {
VALUE frame = frame_get(dc, index); VALUE frame = frame_get(dc, index);
return rb_ary_entry(frame, 0); return rb_ary_entry(frame, 0);
} }
VALUE VALUE
rb_debug_inspector_frame_binding_get(const rb_debug_inspector_t *dc, int index) rb_debug_inspector_frame_binding_get(const rb_debug_inspector_t *dc, long index)
{ {
VALUE frame = frame_get(dc, index); VALUE frame = frame_get(dc, index);
return rb_ary_entry(frame, 1); return rb_ary_entry(frame, 1);
} }
VALUE VALUE
rb_debug_inspector_frame_iseq_get(const rb_debug_inspector_t *dc, int index) rb_debug_inspector_frame_iseq_get(const rb_debug_inspector_t *dc, long index)
{ {
VALUE frame = frame_get(dc, index); VALUE frame = frame_get(dc, index);
return rb_ary_entry(frame, 2); return rb_ary_entry(frame, 2);