[Truffle] Update TaintNode implementation to pass more specs

jruby · Apr 19, 2016 · 58ff364 · nirvdrum · Apr 19, 2016 · bjfish
1 parent 831ca13
commit 58ff364
Showing 6 changed files with 41 additions and 22 deletions.
diff --git a/spec/truffle/tags/core/kernel/taint_tags.txt b/spec/truffle/tags/core/kernel/taint_tags.txt
diff --git a/spec/truffle/tags/core/kernel/trust_tags.txt b/spec/truffle/tags/core/kernel/trust_tags.txt
diff --git a/spec/truffle/tags/core/kernel/untrust_tags.txt b/spec/truffle/tags/core/kernel/untrust_tags.txt
diff --git a/spec/truffle/tags/core/kernel/untrusted_tags.txt b/spec/truffle/tags/core/kernel/untrusted_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/IsTaintedNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/IsTaintedNode.java
@@ -47,10 +47,16 @@ public boolean isTainted(double object) {
         return false;
     }
 
-    @Specialization
+    @Specialization(guards = "isRubySymbol(object) || isNil(object)")
+    protected boolean isTaintedNilOrSymbol(
+        DynamicObject object) {
+        return false;
+    }
+
+    @Specialization(guards = {"!isRubySymbol(object)", "!isNil(object)"})
     protected boolean isTainted(
-            DynamicObject object,
-            @Cached("createReadTaintedNode()") ReadObjectFieldNode readTaintedNode) {
+        DynamicObject object,
+        @Cached("createReadTaintedNode()") ReadObjectFieldNode readTaintedNode) {
         return (boolean) readTaintedNode.execute(object);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/TaintNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/TaintNode.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.language.objects;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -22,6 +23,9 @@
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class TaintNode extends RubyNode {
 
+    @Child private IsFrozenNode isFrozenNode;
+    @Child private IsTaintedNode isTaintedNode;
+
     public TaintNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }
@@ -30,33 +34,51 @@ public TaintNode(RubyContext context, SourceSection sourceSection) {
 
     @Specialization
     public Object taint(boolean object) {
-        return frozen(object);
+        return object;
     }
 
     @Specialization
     public Object taint(int object) {
-        return frozen(object);
+        return object;
     }
 
     @Specialization
     public Object taint(long object) {
-        return frozen(object);
+        return object;
     }
 
     @Specialization
     public Object taint(double object) {
-        return frozen(object);
+        return object;
     }
 
-    @Specialization(guards = "isRubySymbol(symbol)")
-    public Object taintSymbol(DynamicObject symbol) {
-        return frozen(symbol);
+
+    @Specialization(guards = "isRubySymbol(object) || isNil(object)")
+    public Object taintNilOrSymbol(DynamicObject object) {
+        return object;
     }
 
-    @Specialization(guards = "!isRubySymbol(object)")
+    @Specialization(guards = {"!isRubySymbol(object)", "!isNil(object)"})
     public Object taint(
-            DynamicObject object,
-            @Cached("createWriteTaintNode()") WriteObjectFieldNode writeTaintNode) {
+        DynamicObject object,
+        @Cached("createWriteTaintNode()") WriteObjectFieldNode writeTaintNode) {
+
+        if (isTaintedNode == null) {
+            CompilerDirectives.transferToInterpreter();
+            isTaintedNode = insert(IsTaintedNodeGen.create(getContext(), getSourceSection(), null));
+        }
+
+        if (!isTaintedNode.executeIsTainted(object)) {
+            if (isFrozenNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                isFrozenNode = insert(IsFrozenNodeGen.create(getContext(), getSourceSection(), null));
+            }
+
+            if (isFrozenNode.executeIsFrozen(object)) {
+                frozen(object);
+            }
+        }
+
         writeTaintNode.execute(object, true);
         return object;
     }