Fix post mortem location after exception inside load (#562)

deivid-rodriguez · May 30, 2019 · 4a29481 · 4a29481
1 parent c54c665
commit 4a29481
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+* [#562](https://github.com/deivid-rodriguez/byebug/pull/562): post mortem mode landing in the wrong line when coming from an exception inside a `Kernel.load` call.
+
 ### Removed
 
 * Support for MRI 2.3. Byebug no longer installs on this platform.

diff --git a/ext/byebug/byebug.c b/ext/byebug/byebug.c
@@ -436,7 +436,7 @@ raise_event(VALUE trace_point, void *data)
 
   raised_exception = rb_tracearg_raised_exception(trace_arg);
 
-  if (post_mortem == Qtrue)
+  if (post_mortem == Qtrue && !rb_ivar_defined(raised_exception, rb_intern("@__bb_context")))
   {
     pm_context = context_dup(dc);
     rb_ivar_set(raised_exception, rb_intern("@__bb_context"), pm_context);

diff --git a/test/post_mortem_test.rb b/test/post_mortem_test.rb
@@ -48,7 +48,6 @@ def test_post_mortem_mode_sets_post_mortem_flag_to_true
     end
 
     def test_execution_is_stopped_at_the_correct_line_after_exception
-      skip("See issue #165")
       with_setting :post_mortem, true do
         enter "cont"