Pass a parent Frame but not a FrameDescriptor for #instance_eval

* Like other eval's.
* The FrameDescriptor path is now dead code in the TranslatorDriver.

Author: eregon

src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java

@@ -305,7 +305,6 @@ private Object instanceEvalHelper(MaterializedFrame callerFrame, Object receiver
             final RubyRootNode rootNode = getContext().getCodeLoader().parse(
                     source,
                     ParserContext.EVAL,
-                    callerFrame.getFrameDescriptor(),
                     callerFrame,
                     true,
                     this);

src/main/java/org/truffleruby/language/LazyRubyRootNode.java

@@ -73,7 +73,7 @@ public Object execute(VirtualFrame frame) {
             final TranslatorDriver translator = new TranslatorDriver(context);
 
             final String[] argumentsArray = argumentNames.toArray(new String[argumentNames.size()]);
-            final RubyRootNode rootNode = translator.parse(new RubySource(source), ParserContext.TOP_LEVEL, argumentsArray, null, null, true, null);
+            final RubyRootNode rootNode = translator.parse(new RubySource(source), ParserContext.TOP_LEVEL, argumentsArray, null, true, null);
 
             final RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
 

src/main/java/org/truffleruby/language/loader/CodeLoader.java

@@ -12,7 +12,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
@@ -38,25 +37,14 @@ public CodeLoader(RubyContext context) {
         this.context = context;
     }
 
-    // Additional argument: a FrameDescriptor
     @TruffleBoundary
     public RubyRootNode parse(RubySource source,
                               ParserContext parserContext,
-                              FrameDescriptor frameDescriptor,
                               MaterializedFrame parentFrame,
                               boolean ownScopeForAssignments,
                               Node currentNode) {
         final TranslatorDriver translator = new TranslatorDriver(context);
-        return translator.parse(source, parserContext, null, frameDescriptor, parentFrame, ownScopeForAssignments, currentNode);
-    }
-
-    @TruffleBoundary
-    public RubyRootNode parse(RubySource source,
-                              ParserContext parserContext,
-                              MaterializedFrame parentFrame,
-                              boolean ownScopeForAssignments,
-                              Node currentNode) {
-        return parse(source, parserContext, null, parentFrame, ownScopeForAssignments, currentNode);
+        return translator.parse(source, parserContext, null, parentFrame, ownScopeForAssignments, currentNode);
     }
 
     @TruffleBoundary

src/main/java/org/truffleruby/parser/TranslatorDriver.java

@@ -37,7 +37,6 @@
 package org.truffleruby.parser;
 
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -95,8 +94,8 @@ public TranslatorDriver(RubyContext context) {
         parseEnvironment = new ParseEnvironment(context);
     }
 
-    public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames, FrameDescriptor frameDescriptor,
-            MaterializedFrame parentFrame, boolean ownScopeForAssignments, Node currentNode) {
+    public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
+                              MaterializedFrame parentFrame, boolean ownScopeForAssignments, Node currentNode) {
 
         assert parserContext.isTopLevel() == (parentFrame == null) : "A frame should be given iff the context is not toplevel: " + parserContext + " " + parentFrame;
 
@@ -112,16 +111,7 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
 
         final TranslatorEnvironment parentEnvironment;
 
-        if (frameDescriptor != null) {
-            for (FrameSlot slot : frameDescriptor.getSlots()) {
-                if (slot.getIdentifier() instanceof String) {
-                    final String name = (String) slot.getIdentifier();
-                    staticScope.addVariableThisScope(name.intern()); // StaticScope expects interned var names
-                }
-            }
-
-            parentEnvironment = environmentForFrameDescriptor(context, frameDescriptor);
-        } else if (parentFrame != null) {
+        if (parentFrame != null) {
             MaterializedFrame frame = parentFrame;
 
             while (frame != null) {
@@ -345,23 +335,6 @@ public RootParseNode parseToJRubyAST(RubySource rubySource, StaticScope blockSco
         return (RootParseNode) result.getAST();
     }
 
-    private TranslatorEnvironment environmentForFrameDescriptor(RubyContext context, FrameDescriptor frameDescriptor) {
-        final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(
-                context.getCoreLibrary().getSourceSection(),
-                context.getRootLexicalScope(),
-                Arity.NO_ARGUMENTS,
-                null,
-                null,
-                0,
-                "external",
-                null,
-                false);
-            // TODO(CS): how do we know if the frame is a block or not?
-            return new TranslatorEnvironment(null, parseEnvironment,  parseEnvironment.allocateReturnID(),
-                    true, true, false,
-                    sharedMethodInfo, sharedMethodInfo.getName(), 0, null, frameDescriptor);
-    }
-
     private TranslatorEnvironment environmentForFrame(RubyContext context, MaterializedFrame frame) {
         if (frame == null) {
             return null;