[Truffle] Full Module#append_features.

jruby · Jun 2, 2015 · 195761e · 195761e
1 parent b0a41e7
commit 195761e
Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/spec/truffle/tags/core/module/append_features_tags.txt b/spec/truffle/tags/core/module/append_features_tags.txt
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
@@ -34,6 +34,7 @@
 import org.jruby.truffle.nodes.arguments.ReadPreArgumentNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
 import org.jruby.truffle.nodes.cast.BooleanCastNodeGen;
+import org.jruby.truffle.nodes.cast.TaintResultNode;
 import org.jruby.truffle.nodes.coerce.*;
 import org.jruby.truffle.nodes.constants.GetConstantNode;
 import org.jruby.truffle.nodes.constants.GetConstantNodeGen;
@@ -341,15 +342,21 @@ public RubyBasicObject ancestors(RubyModule self) {
     @CoreMethod(names = "append_features", required = 1, visibility = Visibility.PRIVATE)
     public abstract static class AppendFeaturesNode extends CoreMethodArrayArgumentsNode {
 
+        @Child TaintResultNode taintResultNode;
+
         public AppendFeaturesNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            taintResultNode = new TaintResultNode(context, sourceSection);
         }
 
         @Specialization
         public RubyBasicObject appendFeatures(RubyModule module, RubyModule other) {
-            CompilerDirectives.transferToInterpreter();
-
+            if (module instanceof RubyClass) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RaiseException(getContext().getCoreLibrary().typeError("append_features must be called only on modules", this));
+            }
             module.appendFeatures(this, other);
+            taintResultNode.maybeTaint(module, other);
             return nil();
         }
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
@@ -349,7 +349,9 @@ public void changeConstantVisibility(Node currentNode, String name, boolean isPr
 
     @TruffleBoundary
     public void appendFeatures(Node currentNode, RubyModule other) {
-        // TODO(CS): check only run once
+        if (ModuleOperations.includesModule(this, other)) {
+            throw new RaiseException(getContext().getCoreLibrary().argumentError("cyclic include detected", currentNode));
+        }
         other.include(currentNode, this);
     }