Pass the AutoloadConstant to setConstantInternal()

* Do not use the RubyConstant#value field to store the path for an autoload,
  it is already stored in the AutoloadConstant.
* Now it is clear the RubyConstant#value is null for an autoload.

Author: eregon

src/main/java/org/truffleruby/core/module/ModuleFields.java

@@ -39,6 +39,7 @@
 import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.core.symbol.RubySymbol;
+import org.truffleruby.language.AutoloadConstant;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyConstant;
 import org.truffleruby.language.RubyDynamicObject;
@@ -174,7 +175,7 @@ public RubyConstant getAdoptedByLexicalParent(
                 currentNode,
                 name,
                 rubyModule,
-                false);
+                null);
 
         if (!hasFullName()) {
             // Tricky, we need to compare with the Object class, but we only have a Class at hand.
@@ -427,14 +428,15 @@ public RubyConstant setConstant(RubyContext context, Node currentNode, String na
                     name,
                     currentNode);
         } else {
-            return setConstantInternal(context, currentNode, name, value, false);
+            return setConstantInternal(context, currentNode, name, value, null);
         }
     }
 
     @TruffleBoundary
     public void setAutoloadConstant(RubyContext context, Node currentNode, String name, Object filename,
             String javaFilename) {
-        RubyConstant autoloadConstant = setConstantInternal(context, currentNode, name, filename, true);
+        RubyConstant autoloadConstant = setConstantInternal(context, currentNode, name, null,
+                new AutoloadConstant(filename));
         if (autoloadConstant == null) {
             return;
         }
@@ -458,14 +460,14 @@ public void setAutoloadConstant(RubyContext context, Node currentNode, String na
     }
 
     private RubyConstant setConstantInternal(RubyContext context, Node currentNode, String name, Object value,
-            boolean autoload) {
+            AutoloadConstant autoloadConstant) {
         checkFrozen(context, currentNode);
 
         SharedObjects.propagate(context.getLanguageSlow(), rubyModule, value);
 
-        final String autoloadPath = autoload
-                ? RubyGuards.getJavaString(value)
-                : null;
+        final boolean autoload = autoloadConstant != null;
+        final String autoloadPath = autoload ? autoloadConstant.getAutoloadPath() : null;
+
         RubyConstant previous;
         RubyConstant newConstant;
         ConstantEntry previousEntry;
@@ -483,7 +485,7 @@ private RubyConstant setConstantInternal(RubyContext context, Node currentNode,
                     return null;
                 }
             }
-            newConstant = newConstant(currentNode, name, value, autoload, previous);
+            newConstant = newConstant(currentNode, name, value, autoloadConstant, previous);
         } while (!ConcurrentOperations.replace(constants, name, previousEntry, new ConstantEntry(newConstant)));
 
         if (previousEntry != null) {
@@ -497,12 +499,12 @@ private RubyConstant setConstantInternal(RubyContext context, Node currentNode,
         return autoload ? newConstant : previous;
     }
 
-    private RubyConstant newConstant(Node currentNode, String name, Object value, boolean autoload,
+    private RubyConstant newConstant(Node currentNode, String name, Object value, AutoloadConstant autoloadConstant,
             RubyConstant previous) {
         final boolean isPrivate = previous != null && previous.isPrivate();
         final boolean isDeprecated = previous != null && previous.isDeprecated();
         final SourceSection sourceSection = currentNode != null ? currentNode.getSourceSection() : null;
-        return new RubyConstant(rubyModule, name, value, isPrivate, autoload, isDeprecated, sourceSection);
+        return new RubyConstant(rubyModule, name, value, isPrivate, autoloadConstant, isDeprecated, sourceSection);
     }
 
     @TruffleBoundary

src/main/java/org/truffleruby/language/AutoloadConstant.java

@@ -17,13 +17,13 @@
 import org.truffleruby.core.mutex.MutexOperations;
 import org.truffleruby.language.library.RubyStringLibrary;
 
-public class AutoloadConstant {
+public final class AutoloadConstant {
 
     private final Object feature;
     private final String autoloadPath;
     private volatile ReentrantLock autoloadLock;
 
-    AutoloadConstant(Object feature) {
+    public AutoloadConstant(Object feature) {
         assert RubyStringLibrary.getUncached().isRubyString(feature);
         this.feature = feature;
         this.autoloadPath = RubyGuards.getJavaString(this.feature);

src/main/java/org/truffleruby/language/RubyConstant.java

@@ -42,15 +42,15 @@ public RubyConstant(
             String name,
             Object value,
             boolean isPrivate,
-            boolean autoload,
+            AutoloadConstant autoloadConstant,
             boolean isDeprecated,
             SourceSection sourceSection) {
         this(
                 declaringModule,
                 name,
                 value,
                 isPrivate,
-                autoload ? new AutoloadConstant(value) : null,
+                autoloadConstant,
                 false,
                 isDeprecated,
                 sourceSection);

src/main/java/org/truffleruby/language/loader/RequireNode.java

@@ -130,8 +130,7 @@ private boolean requireConsideringAutoload(String feature, String expandedPath,
             final List<RubyConstant> releasedConstants = featureLoader.getAutoloadConstants(expandedPath);
             for (RubyConstant constant : releasedConstants) {
                 if (constant.getAutoloadConstant().isAutoloadingThread() && !alreadyAutoloading.contains(constant)) {
-                    final boolean undefined = GetConstantNode
-                            .autoloadUndefineConstantIfStillAutoload(constant);
+                    final boolean undefined = GetConstantNode.autoloadUndefineConstantIfStillAutoload(constant);
                     GetConstantNode.logAutoloadResult(getContext(), constant, undefined);
                     GetConstantNode.autoloadConstantStop(constant);
                     featureLoader.removeAutoload(constant);