[Truffle] No-op on autoload if the constant is already loaded.

jruby · Jul 8, 2015 · e165d8b · e165d8b
1 parent c4524a1
commit e165d8b
Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/spec/truffle/tags/core/module/autoload_tags.txt b/spec/truffle/tags/core/module/autoload_tags.txt
@@ -1,4 +1,3 @@
-fails:Module#autoload ignores the autoload request if the file is already loaded
 fails:Module#autoload does not remove the constant from the constant table if the loaded files does not define it
 fails:Module#autoload calls #to_path on non-string filenames
 fails:Module#autoload calls #to_path on non-String filename arguments

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -518,6 +518,7 @@ public abstract static class AutoloadNode extends CoreMethodNode {
         @Child private StringNodes.EmptyNode emptyNode;
         private final ConditionProfile invalidConstantName = ConditionProfile.createBinaryProfile();
         private final ConditionProfile emptyFilename = ConditionProfile.createBinaryProfile();
+        private final ConditionProfile alreadyLoaded = ConditionProfile.createBinaryProfile();
 
         public AutoloadNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
@@ -549,6 +550,10 @@ private RubyBasicObject autoload(RubyModule module, String name, RubyString file
                 throw new RaiseException(getContext().getCoreLibrary().argumentError("empty file name", this));
             }
 
+            if (alreadyLoaded.profile(module.getConstants().get(name) != null)) {
+                return nil();
+            }
+
             module.setAutoloadConstant(this, name, filename);
 
             return nil();