ruby-debug-base19 0.11.19 → 0.11.20

data/ext/ruby_debug/ruby_debug.c

@@ -4,6 +4,7 @@
 #include <vm_core.h>
 #include <iseq.h>
 #include <version.h>
+#include <eval_intern.h>
 #include <insns.inc>
 #include <insns_info.inc>
 #include "ruby_debug.h"
@@ -386,6 +387,7 @@ debug_context_create(VALUE thread)
     debug_context->breakpoint = Qnil;
     debug_context->jump_pc = NULL;
     debug_context->jump_cfp = NULL;
+    debug_context->old_iseq_catch = NULL;
     if(rb_obj_class(thread) == cDebugThread)
         CTX_FL_SET(debug_context, CTX_FL_IGNORE);
     return Data_Wrap_Struct(cContext, debug_context_mark, debug_context_free, debug_context);
@@ -684,7 +686,7 @@ create_catch_table(debug_context_t *debug_context, unsigned long cont)
     catch_table->type = CATCH_TYPE_RESCUE;
     catch_table->start = 0;
     catch_table->end = ULONG_MAX;
-    catch_table->cont = cont - insn_len(BIN(trace));
+    catch_table->cont = cont;
     catch_table->sp = 0;
 
     return(catch_table);
@@ -769,6 +771,20 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
     /* only the current thread can proceed */
     locker = thread->self;
 
+    /* restore catch tables removed for jump */
+    if (debug_context->old_iseq_catch != NULL)
+    {
+        int i = 0;
+        while (debug_context->old_iseq_catch[i].iseq != NULL)
+        {
+            debug_context->old_iseq_catch[i].iseq->catch_table = debug_context->old_iseq_catch[i].catch_table;
+            debug_context->old_iseq_catch[i].iseq->catch_table_size = debug_context->old_iseq_catch[i].catch_table_size;
+            i++;
+        }
+        free(debug_context->old_iseq_catch);
+        debug_context->old_iseq_catch = NULL;
+    }
+
     /* make sure all threads have event flag set so we'll get its events */
     st_foreach(thread->vm->living_threads, set_thread_event_flag_i, 0);
 
@@ -1024,7 +1040,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
                 /* create a new catch table to catch this exception, and put it in the current iseq */
                 cfp->iseq->catch_table_size = 1;
                 cfp->iseq->catch_table =
-                    create_catch_table(debug_context, top_frame->info.runtime.last_pc - cfp->iseq->iseq_encoded);
+                    create_catch_table(debug_context, top_frame->info.runtime.last_pc - cfp->iseq->iseq_encoded - insn_len(BIN(trace)));
                 break;
             }
         }
@@ -2276,6 +2292,8 @@ FUNC_FASTCALL(do_jump)(rb_thread_t *th, rb_control_frame_t *cfp)
 {
     VALUE context;
     debug_context_t *debug_context;
+    rb_control_frame_t *jump_cfp;
+    VALUE *jump_pc;
 
     thread_context_lookup(th->self, &context, &debug_context, 0);
     if (debug_context == NULL)
@@ -2283,17 +2301,54 @@ FUNC_FASTCALL(do_jump)(rb_thread_t *th, rb_control_frame_t *cfp)
     cfp->pc[-2] = debug_context->saved_jump_ins[0];
     cfp->pc[-1] = debug_context->saved_jump_ins[1];
 
-    cfp = debug_context->jump_cfp;
-    if ((debug_context->jump_pc < cfp->iseq->iseq_encoded) || (debug_context->jump_pc >= cfp->iseq->iseq_encoded + cfp->iseq->iseq_size))
+    if ((debug_context->jump_pc < debug_context->jump_cfp->iseq->iseq_encoded) || 
+        (debug_context->jump_pc >= debug_context->jump_cfp->iseq->iseq_encoded + cfp->iseq->iseq_size))
         rb_raise(rb_eRuntimeError, "Invalid jump PC target");
-    cfp->pc = debug_context->jump_pc;
 
+    jump_cfp = debug_context->jump_cfp;
+    jump_pc = debug_context->jump_pc;
     debug_context->jump_pc = NULL;
     debug_context->jump_cfp = NULL;
     debug_context->last_line = 0;
     debug_context->last_file = NULL;
     debug_context->stop_next = 1;
-    th->cfp = cfp;
+
+    if (cfp < jump_cfp)
+    {
+        /* save all intermediate-frame catch tables
+           +1 for target frame
+           +1 for array terminator
+         */
+        int frames = jump_cfp - cfp + 2;
+        debug_context->old_iseq_catch = (iseq_catch_t*)malloc(frames * sizeof(iseq_catch_t));
+        MEMZERO(debug_context->old_iseq_catch, iseq_catch_t, frames);
+        frames = 0;
+        do
+        {
+            if (cfp->iseq != NULL)
+            {
+                debug_context->old_iseq_catch[frames].iseq = cfp->iseq;
+                debug_context->old_iseq_catch[frames].catch_table = cfp->iseq->catch_table;
+                debug_context->old_iseq_catch[frames].catch_table_size = cfp->iseq->catch_table_size;
+                cfp->iseq->catch_table = NULL;
+                cfp->iseq->catch_table_size = 0;
+
+                frames++;
+            }
+            cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+        } while (cfp <= jump_cfp);
+
+        jump_cfp->iseq->catch_table_size = 1;
+        jump_cfp->iseq->catch_table = 
+            create_catch_table(debug_context, jump_pc - jump_cfp->iseq->iseq_encoded);
+        jump_cfp->iseq->catch_table->sp = -1;
+
+        JUMP_TAG(TAG_RAISE);
+    }
+    else if (cfp > jump_cfp)
+        rb_raise(rb_eRuntimeError, "Invalid jump frame target");
+
+    cfp->pc = jump_pc;
     return(cfp);
 }
 
@@ -2356,7 +2411,7 @@ context_jump(int argc, VALUE *argv, VALUE self)
                 if (cfp->iseq->insn_info_table[i].line_no != line)
                     continue;
 
-                /* hijack the currently running code so that we can change the frame PC(s) */
+                /* hijack the currently running code so that we can change the frame PC */
                 debug_context->saved_jump_ins[0] = cfp_start->pc[0];
                 debug_context->saved_jump_ins[1] = cfp_start->pc[1];
                 cfp_start->pc[0] = opt_call_c_function;

data/ext/ruby_debug/ruby_debug.h

@@ -26,6 +26,12 @@ typedef struct {
     VALUE errinfo;
 } debug_catch_t;
 
+typedef struct {
+    struct rb_iseq_struct *iseq;
+    struct iseq_catch_table_entry *catch_table;
+    int catch_table_size;
+} iseq_catch_t;
+
 typedef struct {
     int argc;         /* Number of arguments a frame should have. */
     VALUE binding;
@@ -71,6 +77,7 @@ typedef struct {
     VALUE saved_jump_ins[2];
     rb_control_frame_t *jump_cfp;
     VALUE *jump_pc;
+    iseq_catch_t *old_iseq_catch;
 } debug_context_t;
 
 /* variables in ruby_debug.c */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-base19
 version: !ruby/object:Gem::Version 
-  version: 0.11.19
+  version: 0.11.20
 platform: ruby
 authors: 
 - Kent Sibilev