[GR-28743] Always-inline Proc#{call,yield,[]}

PullRequest: truffleruby/2455

Author: eregon

spec/truffle/always_inlined_spec.rb

@@ -106,6 +106,20 @@
         e.backtrace_locations[2].label.should.start_with?('block (4 levels)')
       }
     end
+
+    it "for Proc#call" do
+      line = 0
+      -> {
+        line = __LINE__
+        proc = -> { raise "foo" }
+        proc.call
+      }.should raise_error(RuntimeError, "foo") { |e|
+        e.backtrace_locations[0].label.should.start_with?('block (5 levels)')
+        e.backtrace_locations[0].lineno.should == line + 1
+        e.backtrace_locations[1].label.should.start_with?('block (4 levels)')
+        e.backtrace_locations[1].lineno.should == line + 2
+      }
+    end
   end
 
   it "go uncached if seeing too many different always-inlined methods at a call site" do

src/main/java/org/truffleruby/core/proc/ProcNodes.java

@@ -9,6 +9,9 @@
  */
 package org.truffleruby.core.proc;
 
+import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.frame.Frame;
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
@@ -20,6 +23,7 @@
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.binding.BindingNodes;
 import org.truffleruby.core.binding.RubyBinding;
+import org.truffleruby.core.inlined.AlwaysInlinedMethodNode;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.rope.CodeRange;
 import org.truffleruby.core.string.RubyString;
@@ -186,13 +190,13 @@ protected RubyBinding binding(RubyProc proc) {
         }
     }
 
-    @CoreMethod(names = { "call", "[]", "yield" }, rest = true, needsBlock = true)
-    public abstract static class CallNode extends CoreMethodArrayArgumentsNode {
-
-        @Child private CallBlockNode callBlockNode = CallBlockNode.create();
+    @GenerateUncached
+    @CoreMethod(names = { "call", "[]", "yield" }, rest = true, needsBlock = true, alwaysInlined = true)
+    public abstract static class CallNode extends AlwaysInlinedMethodNode {
 
         @Specialization
-        protected Object call(RubyProc proc, Object[] args, Object block) {
+        protected Object call(Frame callerFrame, RubyProc proc, Object[] args, Object block, RootCallTarget target,
+                @Cached CallBlockNode callBlockNode) {
             return callBlockNode.executeCallBlock(
                     proc.declarationContext,
                     proc,

test/truffle/cexts/backtraces/expected.txt

@@ -16,11 +16,9 @@ Test with an internal error from rb_mutex_lock()
 
 Test error in Ruby => C ext => Ruby => C ext Proc => Ruby
 /bin/backtraces:59:in `block in bar': error (RuntimeError)
-	from /lib/truffle/truffle/cext.rb:n:in `call'
 	from /lib/truffle/truffle/cext.rb:n:in `rb_funcall'
 	from /ext/backtraces/backtraces.c:5:in `baz'
 	from /lib/truffle/truffle/cext.rb:n:in `block in rb_proc_new'
-	from /bin/backtraces:59:in `call'
 	from /bin/backtraces:59:in `bar'
 	from /lib/truffle/truffle/cext.rb:n:in `rb_funcall'
 	from /ext/backtraces/backtraces.c:9:in `foo'
@@ -30,7 +28,6 @@ Test error in Ruby => C ext => Ruby => C ext Proc => Ruby
 Test error in the callback to the Sulong-instrinsified qsort()
 [1, 2, 3, 4]
 /bin/backtraces:76:in `block in <main>': error from Ruby called from instrinsified qsort() (RuntimeError)
-	from /lib/truffle/truffle/cext.rb:n:in `call'
 	from /lib/truffle/truffle/cext.rb:n:in `rb_funcall'
 	from /ext/backtraces/backtraces.c:17:in `compare_function'
 	from com.oracle.truffle.llvm.libraries.bitcode/src/qsort.c:n:in `sulong_qsort'
@@ -43,7 +40,6 @@ Test error in callback from a native function
 42
 /bin/backtraces:88:in `error_helper': error from Ruby called from Sulong called from native callback (RuntimeError)
 	from /bin/backtraces:93:in `block in <main>'
-	from /lib/truffle/truffle/cext.rb:n:in `call'
 	from /lib/truffle/truffle/cext.rb:n:in `rb_funcall'
 	from /ext/backtraces/backtraces.c:38:in `sulong_callback'
 	from /ext/backtraces/backtraces.c:44:in `native_callback'