Add spec for const_defined class pathing from Object

Class path searching should not include Object's constants.

Author: headius

core/src/main/java/org/jruby/RubyModule.java

@@ -4157,11 +4157,9 @@ private boolean constDefined(Ruby runtime, IRubyObject name, boolean inherit) {
         int patternIndex;
         int index = 0;
         RubyModule mod = this;
-        boolean includeObject = false;
 
         if (value.startsWith(pattern)) {
             mod = runtime.getObject();
-            includeObject = true;
             currentOffset += 2;
         }
 
@@ -4206,7 +4204,7 @@ private boolean constDefined(Ruby runtime, IRubyObject name, boolean inherit) {
 
         String id = RubySymbol.newConstantSymbol(runtime, fullName, lastSegment).idString();
 
-        return mod.getConstantSkipAutoload(id, inherit, includeObject) != null;
+        return mod.getConstantSkipAutoload(id, inherit, false) != null;
     }
 
     // MRI: rb_mod_const_get
@@ -4813,10 +4811,10 @@ public IRubyObject getConstantNoConstMissing(String name, boolean inherit) {
     }
 
     public IRubyObject getConstantNoConstMissing(String name, boolean inherit, boolean includeObject) {
-        IRubyObject constant = iterateConstantNoConstMissing(name, this, inherit, true);
+        IRubyObject constant = iterateConstantNoConstMissing(name, this, inherit, true, includeObject);
 
         if (constant == null && !isClass() && includeObject) {
-            constant = iterateConstantNoConstMissing(name, getRuntime().getObject(), inherit, true);
+            constant = iterateConstantNoConstMissing(name, getRuntime().getObject(), inherit, true, includeObject);
         }
 
         return constant;
@@ -4833,10 +4831,10 @@ public IRubyObject getConstantNoConstMissingSKipAutoload(String name) {
 
     // returns null for autoloads that have failed
     private IRubyObject getConstantSkipAutoload(String name, boolean inherit, boolean includeObject) {
-        IRubyObject constant = iterateConstantNoConstMissing(name, this, inherit, false);
+        IRubyObject constant = iterateConstantNoConstMissing(name, this, inherit, false, includeObject);
 
         if (constant == null && !isClass() && includeObject) {
-            constant = iterateConstantNoConstMissing(name, getRuntime().getObject(), inherit, false);
+            constant = iterateConstantNoConstMissing(name, getRuntime().getObject(), inherit, false, includeObject);
         }
 
         return constant;
@@ -4860,8 +4858,9 @@ private static SourceLocation iterateConstantEntryNoConstMissing(String name, Ru
     }
 
     private static IRubyObject iterateConstantNoConstMissing(String name,
-        RubyModule init, boolean inherit, boolean loadConstant) {
+        RubyModule init, boolean inherit, boolean loadConstant, boolean includeObject) {
         for (RubyModule mod = init; mod != null; mod = mod.getSuperClass()) {
+            if (!includeObject && mod == init.getRuntime().getObject()) break;
             IRubyObject value =
                     loadConstant ?
                             mod.getConstantWithAutoload(name, null, true) :

spec/ruby/core/module/const_defined_spec.rb

@@ -149,6 +149,7 @@
     ConstantSpecs.const_defined?("::Object").should == true
     ConstantSpecs.const_defined?("ClassA::CS_CONST10").should == true
     ConstantSpecs.const_defined?("ClassA::CS_CONST10_").should == false
+    ConstantSpecs.const_defined?("ClassA::String").should == false
   end
 
   it "raises a NameError if the name contains non-alphabetic characters except '_'" do