Merge remote-tracking branch 'origin/jruby-9.4'

headius · headius · commit 4156a3536a18 · 2025-07-12T18:37:32.000-05:00
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -4625,6 +4625,7 @@ private boolean constDefined(ThreadContext context, IRubyObject name, boolean in
         int patternIndex;
         int index = 0;
         RubyModule mod = this;
+        boolean includeObject = true;
 
         if (value.startsWith(pattern)) {
             mod = objectClass(context);
@@ -4658,6 +4659,7 @@ private boolean constDefined(ThreadContext context, IRubyObject name, boolean in
 
             mod = (RubyModule) obj;
             currentOffset = patternIndex + pattern.getRealSize();
+            includeObject = false;
         }
 
         if (mod == null) mod = this; // Bare 'Foo'
@@ -4666,7 +4668,7 @@ private boolean constDefined(ThreadContext context, IRubyObject name, boolean in
 
         String id = RubySymbol.newConstantSymbol(context, fullName, lastSegment).idString();
 
-        return mod.getConstantSkipAutoload(context, id, inherit, inherit) != null;
+        return mod.getConstantSkipAutoload(context, id, inherit, inherit && includeObject, false) != null;
     }
 
     // MRI: rb_mod_const_get
@@ -5370,10 +5372,10 @@ public IRubyObject getConstantNoConstMissing(String name, boolean inherit, boole
     }
 
     public IRubyObject getConstantNoConstMissing(ThreadContext context, String name, boolean inherit, boolean includeObject) {
-        IRubyObject constant = iterateConstantNoConstMissing(context, name, this, inherit, true);
+        IRubyObject constant = iterateConstantNoConstMissing(context, name, this, inherit, true, true);
 
         if (constant == null && !isClass() && includeObject) {
-            constant = iterateConstantNoConstMissing(context, name, objectClass(context), inherit, true);
+            constant = iterateConstantNoConstMissing(context, name, objectClass(context), inherit, true, true);
         }
 
         return constant;
@@ -5385,20 +5387,20 @@ public final IRubyObject getConstantNoConstMissingSkipAutoload(String name) {
     }
 
     public final IRubyObject getConstantNoConstMissingSkipAutoload(ThreadContext context, String name) {
-        return getConstantSkipAutoload(context, name, true, true);
+        return getConstantSkipAutoload(context, name, true, true, true);
     }
 
     @Deprecated
     public IRubyObject getConstantNoConstMissingSKipAutoload(String name) {
-        return getConstantSkipAutoload(getCurrentContext(), name, true, true);
+        return getConstantSkipAutoload(getCurrentContext(), name, true, true, true);
     }
 
     // returns null for autoloads that have failed
-    private IRubyObject getConstantSkipAutoload(ThreadContext context, String name, boolean inherit, boolean includeObject) {
-        IRubyObject constant = iterateConstantNoConstMissing(context, name, this, inherit, false);
+    private IRubyObject getConstantSkipAutoload(ThreadContext context, String name, boolean inherit, boolean searchObject, boolean inheritObject) {
+        IRubyObject constant = iterateConstantNoConstMissing(context, name, this, inherit, false, inheritObject);
 
-        if (constant == null && !isClass() && includeObject) {
-            constant = iterateConstantNoConstMissing(context, name, objectClass(context), inherit, false);
+        if (constant == null && !isClass() && searchObject) {
+            constant = iterateConstantNoConstMissing(context, name, getRuntime().getObject(), inherit, false, true);
         }
 
         return constant;
@@ -5423,7 +5425,8 @@ private static SourceLocation iterateConstantEntryNoConstMissing(String name, Ru
     }
 
     private static IRubyObject iterateConstantNoConstMissing(ThreadContext context, String name,
-                                                             RubyModule init, boolean inherit, boolean loadConstant) {
+        RubyModule init, boolean inherit, boolean loadConstant, boolean includeObject) {
+        RubyClass objectClass = init.getRuntime().getObject();
         for (RubyModule mod = init; mod != null; mod = mod.getSuperClass()) {
             IRubyObject value = loadConstant ?
                     mod.getConstantWithAutoload(context, name, null, true) :
@@ -5434,6 +5437,8 @@ private static IRubyObject iterateConstantNoConstMissing(ThreadContext context,
             if (value != null) return value;
 
             if (!inherit) break;
+
+            if (!includeObject && mod.getSuperClass() == objectClass) break;
         }
         return null;
     }
diff --git a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
@@ -250,9 +250,13 @@ public void load(Ruby runtime, boolean wrap) {
         setConfig(context, CONFIG, "TEENY", teeny);
         setConfig(context, CONFIG, "PATCHLEVEL", "0");
         setConfig(context, CONFIG, "ruby_version", major + '.' + minor + ".0");
+
+        // normalize Java version 1.8 to 8
+        String javaSpecVersion = System.getProperty("java.specification.version");
+        if (javaSpecVersion.equals("1.8")) javaSpecVersion = "8";
+
         // Rubygems is too specific on host cpu so until we have real need lets default to universal
-        //setConfig(CONFIG, "arch", System.getProperty("os.arch") + "-java" + System.getProperty("java.specification.version"));
-        setConfig(context, CONFIG, "arch", "universal-java" + System.getProperty("java.specification.version"));
+        setConfig(context, CONFIG, "arch", "universal-java-" + javaSpecVersion);
 
         // Use property for binDir if available, otherwise fall back to common bin default
         String binDir = SafePropertyAccessor.getProperty("jruby.bindir");
diff --git a/spec/ruby/core/module/const_defined_spec.rb b/spec/ruby/core/module/const_defined_spec.rb
@@ -166,4 +166,11 @@
     name.should_receive(:to_str).and_return(123)
     -> { ConstantSpecs.const_defined? name }.should raise_error(TypeError)
   end
+
+  it "does not search Object for a scoped constant name" do
+    Object.const_defined?("ConstantSpecs::ModueA::String").should == false
+    Object.const_defined?("ConstantSpecs::ClassA::String").should == false
+    ConstantSpecs.const_defined?("ModuleA::String").should == false
+    ConstantSpecs.const_defined?("ClassA::String").should == false
+  end
 end
