jruby · Feb 16, 2016 · Feb 16, 2016 · Feb 16, 2016
Showing with 43 additions and 14 deletions.

+12 −14 core/src/main/java/org/jruby/RubyModule.java

+6 −0 spec/regression/GH-3645_autoload.rb

+25 −0 spec/regression/GH-3645_set_non_anonymous_constant.rb
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -3649,21 +3649,21 @@ public IRubyObject setConstant(String name, IRubyObject value, boolean hidden) {
      */
     private IRubyObject setConstantCommon(String name, IRubyObject value, boolean hidden, boolean warn) {
         IRubyObject oldValue = fetchConstant(name);
+
+        setParentForModule(name, value);
+
         if (oldValue != null) {
-            if (oldValue == UNDEF) {
-                setAutoloadConstant(name, value);
-            } else {
-                if (warn) {
+            boolean notAutoload = oldValue != UNDEF;
+            if (notAutoload || !setAutoloadConstant(name, value)) {
+                if (warn && notAutoload) {
                     getRuntime().getWarnings().warn(ID.CONSTANT_ALREADY_INITIALIZED, "already initialized constant " + name);
                 }
-                setParentForModule(name, value);
                 // might just call storeConstant(name, value, hidden) but to maintain
                 // backwards compatibility with calling #storeConstant overrides
                 if (hidden) storeConstant(name, value, true);
                 else storeConstant(name, value);
             }
         } else {
-            setParentForModule(name, value);
             if (hidden) storeConstant(name, value, true);
             else storeConstant(name, value);
         }
@@ -4148,6 +4148,7 @@ protected final IRubyObject finishAutoload(String name) {
             storeConstant(name, value);
         }
         removeAutoload(name);
+        invalidateConstantCache(name);
         return value;
     }
 
@@ -4170,17 +4171,14 @@ protected IRubyObject getAutoloadConstant(String name, boolean loadConstant) {
     /**
      * Set an Object as a defined constant in autoloading.
      */
-    private void setAutoloadConstant(String name, IRubyObject value) {
+    private boolean setAutoloadConstant(String name, IRubyObject value) {
         final Autoload autoload = getAutoloadMap().get(name);
         if ( autoload != null ) {
-            if ( ! autoload.setConstant(getRuntime().getCurrentContext(), value) ) {
-                storeConstant(name, value);
-                removeAutoload(name);
-            }
-        }
-        else {
-            storeConstant(name, value);
+            boolean set = autoload.setConstant(getRuntime().getCurrentContext(), value);
+            if ( ! set ) removeAutoload(name);
+            return set;
         }
+        return false;
     }
 
     /**

diff --git a/spec/regression/GH-3645_autoload.rb b/spec/regression/GH-3645_autoload.rb
@@ -0,0 +1,6 @@
+GH3645.add_mod(:S3)
+
+module GH3645
+  module S3
+  end
+end
diff --git a/spec/regression/GH-3645_set_non_anonymous_constant.rb b/spec/regression/GH-3645_set_non_anonymous_constant.rb
@@ -0,0 +1,25 @@
+module GH3645
+  class << self
+
+    def add_mod(name) # call this from autoloaded script
+      mod = Module.new { extend GH3645 }
+      const_set(name, mod)
+      mod
+    end
+
+  end
+  autoload :S3, File.expand_path('GH-3645_autoload', File.dirname(__FILE__))
+end
+
+describe 'GH-3645' do
+
+  it 'sets a constant' do
+    GH3645.add_mod :A_MODULE
+    expect( GH3645::A_MODULE.name ).to eql 'GH3645::A_MODULE'
+  end
+
+  it 'sets an auto-loaded constant' do
+    expect( GH3645::S3.name ).to eql 'GH3645::S3'
+  end
+
+end