support multiple filename in irep

1 files changed, 6 insertions, 3 deletions

diff --git a/src/error.c b/src/error.c
index f7d41c2e2..4b5eab397 100644
--- a/src/error.c
+++ b/src/error.c
@@ -15,6 +15,7 @@
 #include "mruby/proc.h"
 #include "mruby/string.h"
 #include "mruby/variable.h"
+#include "mruby/debug.h"
 #include "error.h"
 
 mrb_value
@@ -198,9 +199,11 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc)
     if (ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) {
       mrb_irep *irep = ci->proc->body.irep;
 
-      if (irep->filename && irep->lines && irep->iseq <= pc && pc < irep->iseq + irep->ilen) {
-        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "file", 4), mrb_str_new_cstr(mrb, irep->filename));
-        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "line", 4), mrb_fixnum_value(irep->lines[pc - irep->iseq - 1]));
+      int32_t const line = mrb_get_line(irep, pc - irep->iseq - 1);
+      char const* file = mrb_get_filename(irep, pc - irep->iseq - 1);
+      if(line != -1 && file) {
+        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "file", 4), mrb_str_new_cstr(mrb, file));
+        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "line", 4), mrb_fixnum_value(line));
         return;
       }
     }