Preserve file, path, and line number of optimized methods

tdg5 · Oct 12, 2015 · e2b4f63 · e2b4f63
1 parent c296327
commit e2b4f63
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/lib/tco_method.rb b/lib/tco_method.rb
@@ -53,7 +53,9 @@ def self.reevaluate_method_with_tco(receiver, method_name, method_owner)
         #{existing_method.source}
       end
     CODE
-    tco_eval(code)
+
+    file, line = existing_method.source_location
+    tco_eval(code, file, File.dirname(file), line - 1)
     method_name.to_sym
   end
 
@@ -65,8 +67,8 @@ def self.reevaluate_method_with_tco(receiver, method_name, method_owner)
   # @return [Object] Returns the value of the final expression of the provided
   #   code String.
   # @raise [ArgumentError] if the provided code argument is not a String.
-  def self.tco_eval(code)
+  def self.tco_eval(code, file = nil, path = nil, line = nil)
     raise ArgumentError, "Invalid code string!" unless code.is_a?(String)
-    RubyVM::InstructionSequence.new(code, nil, nil, nil, ISEQ_OPTIONS).eval
+    RubyVM::InstructionSequence.new(code, file, path, line, ISEQ_OPTIONS).eval
   end
 end
diff --git a/test/unit/tco_method_test.rb b/test/unit/tco_method_test.rb
@@ -125,8 +125,10 @@ class #{dummy_class.name}
             refute tail_call_optimized?(fib_yielder, 5)
 
             subject.call(method_owner, :module_fib_yielder, :module)
-            fib_yielder = method_owner.method(:module_fib_yielder)
-            assert tail_call_optimized?(fib_yielder, 5)
+            tco_fib_yielder = method_owner.method(:module_fib_yielder)
+            assert tail_call_optimized?(tco_fib_yielder, 5)
+
+            assert_equal fib_yielder.source_location, tco_fib_yielder.source_location
           end
         end
 
@@ -142,8 +144,10 @@ class #{dummy_class.name}
             refute tail_call_optimized?(fib_yielder, 5)
 
             subject.call(method_owner, :class_fib_yielder, :module)
-            fib_yielder = method_owner.method(:class_fib_yielder)
-            assert tail_call_optimized?(fib_yielder, 5)
+            tco_fib_yielder = method_owner.method(:class_fib_yielder)
+            assert tail_call_optimized?(tco_fib_yielder, 5)
+
+            assert_equal fib_yielder.source_location, tco_fib_yielder.source_location
           end
         end
 
@@ -161,8 +165,10 @@ class #{dummy_class.name}
             refute tail_call_optimized?(fib_yielder, 5)
 
             subject.call(method_owner, :instance_fib_yielder, :instance)
-            fib_yielder = instance_class.new.method(:instance_fib_yielder)
-            assert tail_call_optimized?(fib_yielder, 5)
+            tco_fib_yielder = instance_class.new.method(:instance_fib_yielder)
+            assert tail_call_optimized?(tco_fib_yielder, 5)
+
+            assert_equal fib_yielder.source_location, tco_fib_yielder.source_location
           end
         end
       end