debase 0.2.3.beta4 → 0.2.3.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab6aa605704f82f8d20fccc0b7aba1a2790a64e
-  data.tar.gz: e932ae5bf06bed324738e1f7c260333c3e54be04
+  metadata.gz: 682d6984f0e5b33479f3c5138c7af974e59597cf
+  data.tar.gz: ed9e19b600656cbd66f46c29673c1f557db8e51b
 SHA512:
-  metadata.gz: 8410ac3816e22adfd65d8ddc882af826291400700d7ec61a740e3b391fbef05abca1cc0d8ffb26341d675b1518211923d51b89fcfb1bb3611f196306fe010d82
-  data.tar.gz: a3e01772f780cbd70a44b0cab7e291de31988f48f25c563e3c4f3d7e8eb77b8eb02411ee6beab9a5b6c2fdd4de0829017a4339bfe02fd308150af729f6d4a63f
+  metadata.gz: c128d2bfbc14ba0078f5605fbd9b2213eb77fcee710621efb9938d86923b1159707ea743a322e89f6b084089b7c6d1d1b3aec59acbd786578a8b6a0f2a739db6
+  data.tar.gz: df4677f7266bdee7fe11fbb9157544a01233c65707dcb312927962591897a9187a412a976d8e98686a53645228313077c769f91a5e5b519ff72f9716b80aaae5

data/ext/debase_internals.c

@@ -637,6 +637,50 @@ Debase_enable_file_filtering(VALUE self, VALUE value)
   return value;
 }
 
+#if RUBY_API_VERSION_CODE >= 20500 && RUBY_API_VERSION_CODE < 20600 && !(RUBY_RELEASE_YEAR == 2017 && RUBY_RELEASE_MONTH == 10 && RUBY_RELEASE_DAY == 10)
+    static const rb_iseq_t *
+    my_iseqw_check(VALUE iseqw)
+    {
+        rb_iseq_t *iseq = DATA_PTR(iseqw);
+
+        if (!iseq->body) {
+            return NULL;
+        }
+
+        return iseq;
+    }
+
+    static void
+    Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq) {
+        if (!SPECIAL_CONST_P(rb_iseq) && RBASIC_CLASS(rb_iseq) == rb_cISeq) {
+            rb_iseq_t *iseq = my_iseqw_check(rb_iseq);
+
+            if(iseq) {
+                rb_iseq_trace_set(iseq, RUBY_EVENT_TRACEPOINT_ALL);
+            }
+        }
+    }
+
+    static void
+    Debase_unset_trace_flags(VALUE self, VALUE rb_iseq) {
+        if (!SPECIAL_CONST_P(rb_iseq) && RBASIC_CLASS(rb_iseq) == rb_cISeq) {
+            rb_iseq_t *iseq = my_iseqw_check(rb_iseq);
+
+            if(iseq) {
+                rb_iseq_trace_set(iseq, RUBY_EVENT_NONE);
+            }
+        }
+    }
+#else
+      static void
+      Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq) {
+      }
+
+      static void
+      Debase_unset_trace_flags(VALUE self, VALUE rb_iseq) {
+      }
+#endif
+
 static VALUE
 Debase_init_variables()
 {
@@ -680,6 +724,10 @@ Init_debase_internals()
   rb_define_module_function(mDebase, "enable_trace_points", Debase_enable_trace_points, 0);
   rb_define_module_function(mDebase, "prepare_context", Debase_prepare_context, 0);
   rb_define_module_function(mDebase, "init_variables", Debase_init_variables, 0);
+  rb_define_module_function(mDebase, "set_trace_flag_to_iseq", Debase_set_trace_flag_to_iseq, 1);
+
+  //use only for tests
+  rb_define_module_function(mDebase, "unset_iseq_flags", Debase_unset_trace_flags, 1);
 
   idAlive = rb_intern("alive?");
   idAtLine = rb_intern("at_line");

data/lib/debase.rb

@@ -21,9 +21,22 @@ module Debase
       Debugger.const_set('PROG_SCRIPT', $0) unless defined? Debugger::PROG_SCRIPT
       Debugger.const_set('INITIAL_DIR', Dir.pwd) unless  defined? Debugger::INITIAL_DIR
 
+      monkey_patch_prepend
+
       Debugger.started? ? block && block.call(self) : Debugger.start_(&block)
     end
 
+    def monkey_patch_prepend
+      class << RubyVM::InstructionSequence
+        def self.prepend(mod, *smth)
+          super
+          if mod.to_s.include?('Bootsnap') && RUBY_VERSION >= '2.5' && RUBY_VERSION < '2.6'
+            prepend InstructionSequenceMixin
+          end
+        end
+      end
+    end
+
     # @param [String] file
     # @param [Fixnum] line
     # @param [String] expr
@@ -82,6 +95,21 @@ module Debase
     def file_filter
       @file_filter ||= FileFilter.new
     end
+
+    module InstructionSequenceMixin
+      def load_iseq(path)
+        iseq = super(path)
+
+        do_set_flags(iseq)
+
+        iseq
+      end
+
+      def do_set_flags(iseq)
+        Debugger.set_trace_flag_to_iseq(iseq)
+        iseq.each_child { |child_iseq| do_set_flags(child_iseq) } if iseq.respond_to? :each_child
+      end
+    end
   end
 
   class FileFilter

data/lib/debase/version.rb

@@ -1,3 +1,3 @@
 module Debase
-  VERSION = "0.2.3.beta4" unless defined? VERSION
+  VERSION = "0.2.3.beta5" unless defined? VERSION
 end

data/test/test_load.rb

@@ -44,4 +44,35 @@ class TestDebugLoad < Test::Unit::TestCase
   ensure
     Debugger.stop if Debugger.started?
   end
+
+  module MyBootsnap
+    def load_iseq(path)
+      iseq = RubyVM::InstructionSequence.compile_file(path)
+
+      Debugger.unset_iseq_flags(iseq)
+      iseq
+    end
+  end
+
+  def test_bootsnap
+    @@at_line = nil
+    src_dir = File.dirname(__FILE__)
+    prog_script = File.join(src_dir, 'example', 'bootsnap', 'bootsnap.rb')
+
+    class << RubyVM::InstructionSequence
+      prepend MyBootsnap
+    end
+    bt = Debugger.debug_load(prog_script, true)
+    assert_equal(nil, bt)
+    assert_not_nil(@@at_line)
+    if RUBY_VERSION >= '2.5' && RUBY_VERSION < '2.6'
+      assert_equal(['debase.rb', 101], @@at_line)
+    end
+
+    assert(Debugger.started?)
+    Debugger.stop
+
+    class << RubyVM::InstructionSequence; self end.class_eval { undef_method :load_iseq }
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.3.beta4
+  version: 0.2.3.beta5
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -137,35 +137,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: debase
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: debase is a fast implementation of the standard Ruby debugger debug.rb for
   Ruby 2.0
-test_files:
-- test/example/a/example.rb
-- test/example/at-exit.rb
-- test/example/b/example.rb
-- test/example/bootsnap/a.rb
-- test/example/bootsnap/bootsnap.rb
-- test/example/bp_loop_issue.rb
-- test/example/breakpoints-basename.rb
-- test/example/brkpt-class-bug.rb
-- test/example/classes.rb
-- test/example/dollar-0.rb
-- test/example/except-bug1.rb
-- test/example/file with space.rb
-- test/example/gcd.rb
-- test/example/info-var-bug.rb
-- test/example/info-var-bug2.rb
-- test/example/null.rb
-- test/example/output.rb
-- test/example/pm-bug.rb
-- test/example/pm.rb
-- test/example/raise.rb
-- test/helper.rb
-- test/test_base.rb
-- test/test_breakpoints.rb
-- test/test_catchpoint.rb
-- test/test_load.rb
-- test/test_reload_bug.rb
+test_files: []