jruby · Sep 24, 2015 · Sep 24, 2015
Showing with 41 additions and 8 deletions.

+32 −0 spec/ruby/core/binding/local_variable_get_spec.rb

+9 −8 truffle/src/main/java/org/jruby/truffle/nodes/core/BindingNodes.java
diff --git a/spec/ruby/core/binding/local_variable_get_spec.rb b/spec/ruby/core/binding/local_variable_get_spec.rb
@@ -0,0 +1,32 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
+ruby_version_is "2.1" do
+  describe "Binding#local_variable_get" do
+  	it "reads local variables captured in the binding" do
+      a = 42
+      bind = binding
+      bind.local_variable_get(:a).should == 42
+  	end
+
+    it "raises a NameError for missing variables" do
+      bind = BindingSpecs::Demo.new(1).get_empty_binding
+
+      lambda {
+        bind.local_variable_get(:no_such_variable)
+      }.should raise_error(NameError)
+    end
+
+    it "reads variables added later to the binding" do
+      bind = BindingSpecs::Demo.new(1).get_empty_binding
+
+      lambda {
+        bind.local_variable_get(:a)
+      }.should raise_error(NameError)
+
+      bind.local_variable_set(:a, 42)
+
+      bind.local_variable_get(:a).should == 42
+    end
+  end
+end
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/BindingNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/BindingNodes.java
@@ -70,6 +70,10 @@ public FrameSlotAndDepth(FrameSlot slot, int depth) {
             this.slot = slot;
             this.depth = depth;
         }
+
+        public FrameSlot getSlot() {
+            return slot;
+        }
     }
 
     public static FrameSlotAndDepth findFrameSlotOrNull(DynamicObject binding, DynamicObject symbol) {
@@ -137,19 +141,16 @@ public LocalVariableGetNode(RubyContext context, SourceSection sourceSection) {
                 "symbol == cachedSymbol",
                 "!isLastLine(cachedSymbol)",
                 "compatibleFrames(binding, cachedBinding)",
-        }, limit = "getCacheLimit()")
+                "cachedFrameSlot != null"
+        },
+                limit = "getCacheLimit()")
         public Object localVariableGetCached(DynamicObject binding, DynamicObject symbol,
                                              @Cached("symbol") DynamicObject cachedSymbol,
                                              @Cached("binding") DynamicObject cachedBinding,
                                              @Cached("findFrameSlotOrNull(binding, symbol)") FrameSlotAndDepth cachedFrameSlot,
                                              @Cached("createReadNode(cachedFrameSlot)") ReadFrameSlotNode readLocalVariableNode) {
-            if (cachedFrameSlot == null) {
-                CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().nameErrorLocalVariableNotDefined(Layouts.SYMBOL.getString(symbol), binding, this));
-            } else {
-                final MaterializedFrame frame = RubyArguments.getDeclarationFrame(Layouts.BINDING.getFrame(binding), cachedFrameSlot.depth);
-                return readLocalVariableNode.executeRead(frame);
-            }
+            final MaterializedFrame frame = RubyArguments.getDeclarationFrame(Layouts.BINDING.getFrame(binding), cachedFrameSlot.depth);
+            return readLocalVariableNode.executeRead(frame);
         }
 
         @TruffleBoundary