jruby · Apr 21, 2015 · Apr 21, 2015
diff --git a/spec/truffle/tags/core/module/private_instance_methods_tags.txt b/spec/truffle/tags/core/module/private_instance_methods_tags.txt
diff --git a/spec/truffle/tags/core/module/protected_instance_methods_tags.txt b/spec/truffle/tags/core/module/protected_instance_methods_tags.txt
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
@@ -1491,7 +1491,7 @@ public ProtectedInstanceMethodsNode(ProtectedInstanceMethodsNode prev) {
 
         @Specialization
         public RubyArray protectedInstanceMethods(RubyModule module, UndefinedPlaceholder argument) {
-            return protectedInstanceMethods(module, false);
+            return protectedInstanceMethods(module, true);
         }
 
         @Specialization
@@ -1501,12 +1501,10 @@ public RubyArray protectedInstanceMethods(RubyModule module, boolean includeAnce
 
             return RubyArray.fromObjects(getContext().getCoreLibrary().getArrayClass(),
                     module.filterMethods(includeAncestors, new RubyModule.MethodFilter() {
-
                         @Override
                         public boolean filter(InternalMethod method) {
                             return method.getVisibility() == Visibility.PROTECTED;
                         }
-
                     }).toArray());
         }
     }
@@ -1551,7 +1549,7 @@ public PrivateInstanceMethodsNode(PrivateInstanceMethodsNode prev) {
 
         @Specialization
         public RubyArray privateInstanceMethods(RubyModule module, UndefinedPlaceholder argument) {
-            return privateInstanceMethods(module, false);
+            return privateInstanceMethods(module, true);
         }
 
         @Specialization
@@ -1560,12 +1558,10 @@ public RubyArray privateInstanceMethods(RubyModule module, boolean includeAncest
 
             return RubyArray.fromObjects(getContext().getCoreLibrary().getArrayClass(),
                     module.filterMethods(includeAncestors, new RubyModule.MethodFilter() {
-
                         @Override
                         public boolean filter(InternalMethod method) {
                             return method.getVisibility() == Visibility.PRIVATE;
                         }
-
                     }).toArray());
         }
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -423,8 +423,6 @@ private void initializeConstants() {
 
         objectClass.setConstant(null, "ARGV", argv);
 
-        rubiniusModule.setConstant(null, "UNDEFINED", rubiniusUndefined);
-
         final RubyString separator = RubyString.fromJavaString(stringClass, "/");
         separator.freeze();
 

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -2650,6 +2650,11 @@ public RubyNode visitUntilNode(org.jruby.ast.UntilNode node) {
 
     @Override
     public RubyNode visitVCallNode(org.jruby.ast.VCallNode node) {
+        final SourceSection sourceSection = translate(node.getPosition());
+        if (node.getName().equals("undefined") && sourceSection.getSource().getPath().startsWith("core:/core/")) {
+            return new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getRubiniusUndefined());
+        }
+
         final org.jruby.ast.Node receiver = new org.jruby.ast.SelfNode(node.getPosition());
         final CallNode callNode = new CallNode(node.getPosition(), receiver, node.getName(), null, null);
         return visitCallNodeExtraArgument(callNode, null, true, true);

diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -19,7 +19,6 @@
 require_relative 'core/rubinius/api/shims/rubinius'
 require_relative 'core/rubinius/api/shims/thread'
 require_relative 'core/rubinius/api/shims/tuple'
-require_relative 'core/rubinius/api/shims/undefined'
 require_relative 'core/rubinius/api/shims/metrics'
 require_relative 'core/rubinius/api/shims/module'
 

diff --git a/truffle/src/main/ruby/core/rubinius/api/shims/undefined.rb b/truffle/src/main/ruby/core/rubinius/api/shims/undefined.rb