Remember the node which set the unpublishedValue for Module#const_source_location

Author: eregon

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

@@ -498,7 +498,7 @@ private RubyConstant setConstantInternal(RubyContext context, Node currentNode,
                 } else {
                     if (previous.isAutoload() && previous.getAutoloadConstant().isAutoloadingThread() &&
                             !previous.getAutoloadConstant().isPublished()) {
-                        previous.getAutoloadConstant().setUnpublishedValue(value);
+                        previous.getAutoloadConstant().setUnpublishedValue(value, currentNode);
                         return previous;
                     }
                 }

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

@@ -23,6 +23,7 @@ public final class AutoloadConstant {
     private final String autoloadPath;
     private volatile ReentrantLock autoloadLock;
     private Object unpublishedValue = null;
+    private Node unpublishedValueNode = null;
     private boolean published = false;
 
     public AutoloadConstant(Object feature) {
@@ -80,21 +81,23 @@ public Object getUnpublishedValue() {
         return unpublishedValue;
     }
 
-    public void setUnpublishedValue(Object unpublishedValue) {
+    public void setUnpublishedValue(Object unpublishedValue, Node currentNode) {
         assert isAutoloadingThread();
         assert RubyGuards.assertIsValidRubyValue(unpublishedValue);
         this.unpublishedValue = unpublishedValue;
+        this.unpublishedValueNode = currentNode;
     }
 
     public boolean isPublished() {
         assert isAutoloadingThread();
         return published;
     }
 
-    public void publish(RubyContext context, RubyConstant constant, Node node) {
+    public void publish(RubyContext context, RubyConstant constant) {
         assert isAutoloadingThread();
         assert hasUnpublishedValue();
         this.published = true;
-        constant.getDeclaringModule().fields.setConstant(context, node, constant.getName(), getUnpublishedValue());
+        constant.getDeclaringModule().fields.setConstant(context, unpublishedValueNode, constant.getName(),
+                unpublishedValue);
     }
 }

src/main/java/org/truffleruby/language/constants/GetConstantNode.java

@@ -130,7 +130,7 @@ protected Object autoloadConstant(
                 callRequireNode.call(coreLibrary().mainObject, "require", feature);
             } finally {
                 if (autoloadConstant.hasUnpublishedValue()) {
-                    autoloadConstant.publish(getContext(), constant, this);
+                    autoloadConstant.publish(getContext(), constant);
                 }
             }
 

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

@@ -130,7 +130,7 @@ private boolean requireConsideringAutoload(String feature, String expandedPath,
             for (RubyConstant constant : releasedConstants) {
                 if (constant.getAutoloadConstant().isAutoloadingThread() && !alreadyAutoloading.contains(constant)) {
                     if (constant.getAutoloadConstant().hasUnpublishedValue()) {
-                        constant.getAutoloadConstant().publish(getContext(), constant, this);
+                        constant.getAutoloadConstant().publish(getContext(), constant);
                     }
 
                     final boolean undefined = GetConstantNode.autoloadUndefineConstantIfStillAutoload(constant);