jruby · Dec 8, 2014 · Dec 8, 2014 · Dec 9, 2014
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
@@ -271,6 +271,10 @@ public Object methodMissing(RubyBasicObject self, Object[] args, RubyProc block)
         }
 
         private Object methodMissing(RubyBasicObject self, RubySymbol name, Object[] args, RubyProc block) {
+            if (self == getContext().getCoreLibrary().getMainObject()) {
+                throw new RaiseException(getContext().getCoreLibrary().nameError(String.format("undefined local variable or method `%s' for main:Object", name.toString()), this));
+            }
+
             throw new RaiseException(getContext().getCoreLibrary().noMethodError(name.toString(), self.toString(), this));
         }
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -508,7 +508,7 @@ public Object eval(RubyString source, RubyBinding binding) {
             return getContext().eval(source.toString(), binding, this);
         }
 
-        @Specialization(guards = "!isString")
+        @Specialization(guards = "!isString(arguments[0])")
         public Object eval(VirtualFrame frame, RubyBasicObject object, @SuppressWarnings("unused") UndefinedPlaceholder binding) {
             notDesignedForCompilation();
 
@@ -518,7 +518,7 @@ public Object eval(VirtualFrame frame, RubyBasicObject object, @SuppressWarnings
             return eval(frame, object, defaultBinding);
         }
 
-        @Specialization(guards = "!isString")
+        @Specialization(guards = "!isString(arguments[0])")
         public Object eval(VirtualFrame frame, RubyBasicObject object, RubyBinding binding) {
             notDesignedForCompilation();
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java b/core/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
@@ -68,7 +68,7 @@ public Object executeDispatch(
             return doRubyBasicObject(
                     frame,
                     first,
-                    (LexicalScope) lexicalScope,
+                    lexicalScope,
                     receiverObject,
                     methodName,
                     blockObject,
@@ -79,7 +79,7 @@ public Object executeDispatch(
             return doUnboxedObject(
                     frame,
                     first,
-                    (LexicalScope) lexicalScope,
+                    lexicalScope,
                     receiverObject,
                     methodName,
                     blockObject,

diff --git a/spec/truffle/tags/core/kernel/eval_tags.txt b/spec/truffle/tags/core/kernel/eval_tags.txt
@@ -1,6 +1,5 @@
 fails:Kernel#eval evaluates within the scope of the eval
 fails:Kernel#eval evaluates such that consts are scoped to the class of the eval
-fails:Kernel#eval does not share locals across eval scopes
 fails:Kernel#eval doesn't accept a Proc object as a binding
 fails:Kernel#eval allows a binding to be captured inside an eval
 fails:Kernel#eval uses the same scope for local variables when given the same binding