Remove from the autoload map after the autoload is resolved

Author: eregon

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

@@ -82,12 +82,13 @@ public void initialize(NativeConfiguration nativeConfiguration, TruffleNFIPlatfo
     }
 
     public void addAutoload(RubyConstant autoloadConstant) {
-        final String basename = basenameWithoutExtension(StringOperations.getString(autoloadConstant.getAutoloadPath()));
+        final String autoloadPath = StringOperations.getString(autoloadConstant.getAutoloadPath());
+        final String basename = basenameWithoutExtension(autoloadPath);
 
         registeredAutoloadsLock.lock();
         try {
             final Map<String, RubyConstant> constants = ConcurrentOperations.getOrCompute(registeredAutoloads, basename, k -> new HashMap<>());
-            constants.put(StringOperations.getString(autoloadConstant.getAutoloadPath()), autoloadConstant);
+            constants.put(autoloadPath, autoloadConstant);
         } finally {
             registeredAutoloadsLock.unlock();
         }
@@ -117,6 +118,19 @@ public RubyConstant isAutoloadPath(String expandedPath) {
         return null;
     }
 
+    public void removeAutoload(RubyConstant constant) {
+        final String autoloadPath = StringOperations.getString(constant.getAutoloadPath());
+        final String basename = basenameWithoutExtension(autoloadPath);
+
+        registeredAutoloadsLock.lock();
+        try {
+            final Map<String, RubyConstant> constantsMap = registeredAutoloads.get(basename);
+            constantsMap.remove(autoloadPath, constant);
+        } finally {
+            registeredAutoloadsLock.unlock();
+        }
+    }
+
     private String basenameWithoutExtension(String path) {
         final String basename = new File(path).getName();
         int i = basename.lastIndexOf('.');

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

@@ -130,7 +130,11 @@ private boolean requireConsideringAutoload(String feature, String expandedPath,
 
             boolean[] result = new boolean[1];
             Runnable require = () -> result[0] = doRequire(feature, expandedPath, pathString);
-            getConstantNode.autoloadConstant(LexicalScope.IGNORE, autoloadConstant.getDeclaringModule(), autoloadConstant.getName(), autoloadConstant, lookupConstantNode, require);
+            try {
+                getConstantNode.autoloadConstant(LexicalScope.IGNORE, autoloadConstant.getDeclaringModule(), autoloadConstant.getName(), autoloadConstant, lookupConstantNode, require);
+            } finally {
+                featureLoader.removeAutoload(autoloadConstant);
+            }
             return result[0];
         } else {
             return doRequire(feature, expandedPath, pathString);