jruby · Oct 5, 2015 · Oct 5, 2015 · Oct 5, 2015 · Oct 5, 2015
diff --git a/test/truffle/pe/core/binding_pe.rb b/test/truffle/pe/core/binding_pe.rb
@@ -13,8 +13,7 @@
 example "x = 14; binding.local_variable_get(:x) * 2", 28
 
 # Proc#binding
-tagged_example "x = 14; p = Proc.new { }; p.binding.local_variable_get(:x)", 14
-example "x = 14; p = Proc.new { }; p.binding.local_variable_get(:x) * 2", 28
+example "x = 14; p = Proc.new { }; p.binding.local_variable_get(:x)", 14
 
 # set + get
 tagged_example "b = binding; b.local_variable_set(:x, 14); b.local_variable_get(:x)", 14

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -894,7 +894,7 @@ public String block() throws InterruptedException {
 
             // Set the local variable $_ in the caller
 
-            final Frame caller = RubyCallStack.getCallerFrame(getContext()).getFrame(FrameInstance.FrameAccess.READ_WRITE, false);
+            final Frame caller = RubyCallStack.getCallerFrame(getContext()).getFrame(FrameInstance.FrameAccess.READ_WRITE, true);
 
             final FrameSlot slot = caller.getFrameDescriptor().findFrameSlot("$_");
 
@@ -1244,8 +1244,7 @@ public LocalVariablesNode(RubyContext context, SourceSection sourceSection) {
         @TruffleBoundary
         @Specialization
         public DynamicObject localVariables() {
-            Frame frame = RubyCallStack.getCallerFrame(getContext()).getFrame(FrameInstance.FrameAccess.READ_ONLY, false);
-
+            final Frame frame = RubyCallStack.getCallerFrame(getContext()).getFrame(FrameInstance.FrameAccess.READ_ONLY, true);
             return BindingNodes.LocalVariablesNode.listLocalVariables(getContext(), frame);
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -635,11 +635,12 @@ public Object classEval(VirtualFrame frame, DynamicObject module, DynamicObject
             return classEvalSource(module, code, toStr(frame, file).toString());
         }
 
+        @TruffleBoundary
         private Object classEvalSource(DynamicObject module, DynamicObject code, String file) {
             assert RubyGuards.isRubyString(code);
 
             final MaterializedFrame callerFrame = RubyCallStack.getCallerFrame(getContext())
-                    .getFrame(FrameInstance.FrameAccess.MATERIALIZE, false).materialize();
+                    .getFrame(FrameInstance.FrameAccess.MATERIALIZE, true).materialize();
             Encoding encoding = StringOperations.getByteList(code).getEncoding();
 
             CompilerDirectives.transferToInterpreter();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
@@ -110,7 +110,7 @@ public static Object matchCommon(DynamicObject regexp, DynamicObject source, boo
         final ByteList bytes = StringOperations.getByteList(source);
         final RubyContext context = Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(regexp)).getContext();
 
-        final Frame frame = RubyCallStack.getCallerFrame(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(regexp)).getContext()).getFrame(FrameInstance.FrameAccess.READ_WRITE, false);
+        final Frame frame = RubyCallStack.getCallerFrame(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(regexp)).getContext()).getFrame(FrameInstance.FrameAccess.READ_WRITE, true);
 
         final int match = matcher.search(startPos, range, Option.DEFAULT);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java
@@ -499,7 +499,6 @@ public DynamicObject eachPackedArray(VirtualFrame frame, DynamicObject hash, Dyn
             assert HashOperations.verifyStore(getContext(), hash);
 
             final Object[] store = (Object[]) Layouts.HASH.getStore(hash);
-            final int size = Layouts.HASH.getSize(hash);
 
             int count = 0;
 
@@ -509,7 +508,7 @@ public DynamicObject eachPackedArray(VirtualFrame frame, DynamicObject hash, Dyn
                         count++;
                     }
 
-                    if (n < size) {
+                    if (n < Layouts.HASH.getSize(hash)) {
                         yield(frame, block, Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), new Object[]{PackedArrayStrategy.getKey(store, n), PackedArrayStrategy.getValue(store, n)}, 2));
                     }
                 }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusLastStringReadNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RubiniusLastStringReadNode.java
@@ -10,9 +10,11 @@
 
 package org.jruby.truffle.nodes.rubinius;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyCallStack;
 import org.jruby.truffle.runtime.RubyContext;
@@ -26,9 +28,11 @@ public RubiniusLastStringReadNode(RubyContext context, SourceSection sourceSecti
 
     @Override
     public Object execute(VirtualFrame frame) {
+        CompilerDirectives.transferToInterpreter();
+
         // Rubinius expects $_ to be thread-local, rather than frame-local.  If we see it in a method call, we need
         // to look to the caller's frame to get the correct value, otherwise it will be nil.
-        final MaterializedFrame callerFrame = RubyCallStack.getCallerFrame(getContext()).getFrame(FrameInstance.FrameAccess.READ_ONLY, false).materialize();
+        final MaterializedFrame callerFrame = RubyCallStack.getCallerFrame(getContext()).getFrame(FrameInstance.FrameAccess.READ_ONLY, true).materialize();
 
         final FrameSlot slot = callerFrame.getFrameDescriptor().findFrameSlot("$_");
         try {

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/object/ObjectGraph.java b/truffle/src/main/java/org/jruby/truffle/runtime/object/ObjectGraph.java
@@ -54,15 +54,15 @@ public void run(DynamicObject thread, Node currentNode) {
                     final FrameInstance currentFrame = Truffle.getRuntime().getCurrentFrame();
 
                     if (currentFrame != null) {
-                        stack.addAll(getObjectsInFrame(currentFrame.getFrame(FrameInstance.FrameAccess.READ_ONLY, false)));
+                        stack.addAll(getObjectsInFrame(currentFrame.getFrame(FrameInstance.FrameAccess.READ_ONLY, true)));
                     }
 
                     Truffle.getRuntime().iterateFrames(new FrameInstanceVisitor<Object>() {
 
                         @Override
                         public Object visitFrame(FrameInstance frameInstance) {
                             stack.addAll(getObjectsInFrame(frameInstance
-                                    .getFrame(FrameInstance.FrameAccess.READ_ONLY, false)));
+                                    .getFrame(FrameInstance.FrameAccess.READ_ONLY, true)));
 
                             return null;
                         }