ruby-vm.patch

From a010f0e13be5b1e791c92d9708dff8d5a8d45de4 Mon Sep 17 00:00:00 2001
From: Eugene Kenny <elkenny@gmail.com>
Date: Sun, 8 Jan 2017 02:13:36 +0000
Subject: [PATCH] forwardable/impl.rb: include trace instruction

---
 ext/rubyvm/lib/forwardable/impl.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/rubyvm/lib/forwardable/impl.rb b/ext/rubyvm/lib/forwardable/impl.rb
index e9ada26e74..4f8dfc7773 100644
--- a/ext/rubyvm/lib/forwardable/impl.rb
+++ b/ext/rubyvm/lib/forwardable/impl.rb
@@ -12,7 +12,6 @@ def self._valid_method?(method)
 
   def self._compile_method(src, file, line)
     RubyVM::InstructionSequence.compile(src, file, file, line,
-               trace_instruction: false,
                tailcall_optimization: true)
       .eval
   end
-- 
2.11.0

From 4a14581afc9a7cf813e4fbb2bd94aad50688cade Mon Sep 17 00:00:00 2001
From: Eugene Kenny <elkenny@gmail.com>
Date: Sun, 8 Jan 2017 00:53:37 +0000
Subject: [PATCH] forwardable.rb: use public_send to call method

---
 lib/forwardable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index 3662f56011..663377b761 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -209,7 +209,7 @@ def self._delegator_method(obj, accessor, method, ali)
             ::Kernel.warn "\#{caller_locations(1)[0]}: "#{mesg.dump}"\#{_.class}"'##{method}'
             _#{method_call}
           else
-            _.#{method}(*args, &block)
+            _.public_send(:#{method}, *args, &block)
           end
         end;
     end
-- 
2.11.0

--- a/vm_insnhelper.c	(revision 57292)
+++ b/vm_insnhelper.c	(revision 57293)
@@ -1538,8 +1538,6 @@
     vm_pop_frame(th, cfp, cfp->ep);
     cfp = th->cfp;
 
-    RUBY_VM_CHECK_INTS(th);
-
     sp_orig = sp = cfp->sp;
 
     /* push self */
@@ -1558,6 +1556,8 @@
 		  iseq->body->stack_max);
 
     cfp->sp = sp_orig;
+    RUBY_VM_CHECK_INTS(th);
+
     return Qundef;
 }