[Truffle] The data is in the arguments not in slots for attachments.

jruby · Dec 3, 2015 · 47f9a0d · 47f9a0d
1 parent efb2d97
commit 47f9a0d
Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/LazyRubyRootNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/LazyRubyRootNode.java
@@ -29,6 +29,7 @@
 public class LazyRubyRootNode extends RootNode {
 
     private final Source source;
+    private final String[] argumentNames;
 
     @CompilationFinal private RubyContext cachedContext;
     @CompilationFinal private DynamicObject mainObject;
@@ -37,9 +38,10 @@ public class LazyRubyRootNode extends RootNode {
     @Child private Node findContextNode;
     @Child private DirectCallNode callNode;
 
-    public LazyRubyRootNode(SourceSection sourceSection, FrameDescriptor frameDescriptor, Source source) {
+    public LazyRubyRootNode(SourceSection sourceSection, FrameDescriptor frameDescriptor, Source source, String[] argumentNames) {
         super(RubyLanguage.class, sourceSection, frameDescriptor);
         this.source = source;
+        this.argumentNames = argumentNames;
     }
 
     @Override
@@ -60,9 +62,8 @@ public Object execute(VirtualFrame frame) {
             CompilerDirectives.transferToInterpreter();
 
             if (AttachmentsManager.ATTACHMENT_SOURCE == source) {
-                final FrameDescriptor frameDescriptor = frame.getFrameDescriptor();
-                final SourceSection sourceSection = (SourceSection) frame.getValue(frameDescriptor.findFrameSlot("section"));
-                final DynamicObject block = (DynamicObject) frame.getValue(frameDescriptor.findFrameSlot("block"));
+                final SourceSection sourceSection = (SourceSection) frame.getArguments()[getIndex("section")];
+                final DynamicObject block = (DynamicObject) frame.getArguments()[getIndex("block")];
 
                 final RootNode rootNode = new AttachmentsManager.AttachmentRootNode(RubyLanguage.class, cachedContext, sourceSection, null, block);
                 final CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
@@ -92,4 +93,13 @@ public Object execute(VirtualFrame frame) {
                 RubyArguments.pack(method, null, null, mainObject, null, DeclarationContext.TOP_LEVEL, frame.getArguments()));
     }
 
+    private int getIndex(String name) {
+        for (int i = 0; i < argumentNames.length; i++) {
+            if (name.equals(argumentNames[i])) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java
@@ -77,7 +77,7 @@ protected void disposeContext(RubyContext context) {
 
     @Override
     protected CallTarget parse(Source source, Node node, String... argumentNames) throws IOException {
-        return Truffle.getRuntime().createCallTarget(new LazyRubyRootNode(null, null, source));
+        return Truffle.getRuntime().createCallTarget(new LazyRubyRootNode(null, null, source, argumentNames));
     }
 
     @Override