jruby · Jun 20, 2015 · Jun 20, 2015 · Jun 20, 2015 · Jun 20, 2015 · Jun 20, 2015
diff --git a/spec/truffle/tags/core/kernel/untaint_tags.txt b/spec/truffle/tags/core/kernel/untaint_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -543,7 +543,7 @@ public ExecNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @Specialization
-        public Object require(VirtualFrame frame, Object[] args) {
+        public Object exec(VirtualFrame frame, Object[] args) {
             if (toHashNode == null) {
                 CompilerDirectives.transferToInterpreter();
                 toHashNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
@@ -1956,41 +1956,28 @@ public RubyBasicObject toS(VirtualFrame frame, Object self) {
     @CoreMethod(names = "untaint")
     public abstract static class UntaintNode extends CoreMethodArrayArgumentsNode {
 
+        @Child private IsFrozenNode isFrozenNode;
+        @Child private IsTaintedNode isTaintedNode;
         @Child private WriteHeadObjectFieldNode writeTaintNode;
 
         public UntaintNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            isFrozenNode = IsFrozenNodeGen.create(context, sourceSection, null);
+            isTaintedNode = IsTaintedNodeGen.create(context, sourceSection, null);
             writeTaintNode = new WriteHeadObjectFieldNode(RubyBasicObject.TAINTED_IDENTIFIER);
         }
 
         @Specialization
-        public Object taint(boolean object) {
-            return frozen(object);
-        }
-
-        @Specialization
-        public Object taint(int object) {
-            return frozen(object);
-        }
-
-        @Specialization
-        public Object taint(long object) {
-            return frozen(object);
-        }
-
-        @Specialization
-        public Object taint(double object) {
-            return frozen(object);
-        }
-
-        private Object frozen(Object object) {
-            CompilerDirectives.transferToInterpreter();
-            throw new RaiseException(getContext().getCoreLibrary().frozenError(getContext().getCoreLibrary().getLogicalClass(object).getName(), this));
-        }
+        public Object taint(RubyBasicObject object) {
+            if (!isTaintedNode.executeIsTainted(object)) {
+                return object;
+            }
 
+            if (isFrozenNode.executeIsFrozen(object)) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RaiseException(getContext().getCoreLibrary().frozenError(getContext().getCoreLibrary().getLogicalClass(object).getName(), this));
+            }
 
-        @Specialization
-        public Object taint(RubyBasicObject object) {
             writeTaintNode.execute(object, false);
             return object;
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/IsTaintedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/IsTaintedNode.java
@@ -50,12 +50,7 @@ public boolean isTainted(double object) {
         return false;
     }
 
-    @Specialization(guards = "isRubySymbol(symbol)")
-    public boolean isTaintedSymbol(RubyBasicObject symbol) {
-        return false;
-    }
-
-    @Specialization(guards = "!isRubySymbol(object)")
+    @Specialization
     public boolean isTainted(RubyBasicObject object) {
         if (readTaintNode == null) {
             CompilerDirectives.transferToInterpreter();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/TimePrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/TimePrimitiveNodes.java
@@ -150,13 +150,16 @@ public long timeUSeconds(RubyTime time) {
     @RubiniusPrimitive(name = "time_decompose")
     public static abstract class TimeDecomposePrimitiveNode extends RubiniusPrimitiveNode {
 
+        @Child private ReadTimeZoneNode readTimeZoneNode;
+
         public TimeDecomposePrimitiveNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            readTimeZoneNode = new ReadTimeZoneNode(context, sourceSection);
         }
 
-        @TruffleBoundary
         @Specialization
-        public RubyBasicObject timeDecompose(RubyTime time) {
+        public RubyBasicObject timeDecompose(VirtualFrame frame, RubyTime time) {
+            CompilerDirectives.transferToInterpreter();
             final DateTime dateTime = time.getDateTime();
             final int sec = dateTime.getSecondOfMinute();
             final int min = dateTime.getMinuteOfHour();
@@ -174,8 +177,7 @@ public RubyBasicObject timeDecompose(RubyTime time) {
             final int yday = dateTime.getDayOfYear();
             final boolean isdst = false;
 
-            // TODO CS 14-Feb-15 uses debug send
-            final String envTimeZoneString = DebugOperations.send(getContext(), getContext().getCoreLibrary().getENV(), "[]", null, createString("TZ")).toString();
+            final String envTimeZoneString = readTimeZoneNode.executeRubyString(frame).toString();
             String zoneString = org.jruby.RubyTime.zoneHelper(envTimeZoneString, dateTime, false);
             Object zone;
             if (zoneString.matches(".*-\\d+")) {
@@ -210,8 +212,11 @@ public RubyBasicObject timeStrftime(RubyTime time, RubyString format) {
     @RubiniusPrimitive(name = "time_s_from_array", needsSelf = true, lowerFixnumParameters = { 0 /*sec*/, 6 /*nsec*/, 7 /*isdst*/})
     public static abstract class TimeSFromArrayPrimitiveNode extends RubiniusPrimitiveNode {
 
+        @Child ReadTimeZoneNode readTimeZoneNode;
+
         public TimeSFromArrayPrimitiveNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            readTimeZoneNode = new ReadTimeZoneNode(context, sourceSection);
         }
 
         @Specialization
@@ -242,7 +247,7 @@ private RubyTime buildTime(VirtualFrame frame, RubyClass timeClass, int sec, int
             if (fromutc) {
                 zone = DateTimeZone.UTC;
             } else if (utcoffset == nil()) {
-                String tz = DebugOperations.send(getContext(), getContext().getCoreLibrary().getENV(), "[]", null, createString("TZ")).toString();
+                String tz = readTimeZoneNode.executeRubyString(frame).toString();
                 zone = org.jruby.RubyTime.getTimeZoneFromTZString(getContext().getRuntime(), tz);
             } else if (utcoffset instanceof Integer) {
                 zone = DateTimeZone.forOffsetMillis(((int) utcoffset) * 1_000);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/time/ReadTimeZoneNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/time/ReadTimeZoneNode.java
@@ -11,28 +11,36 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.nodes.constants.ReadConstantNode;
 import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
+import org.jruby.truffle.nodes.literal.LiteralNode;
+import org.jruby.truffle.runtime.LexicalScope;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyString;
 
 public class ReadTimeZoneNode extends RubyNode {
 
     @Child private CallDispatchHeadNode hashNode;
+    @Child private ReadConstantNode envNode;
 
     private final RubyBasicObject TZ;
 
     public ReadTimeZoneNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
         hashNode = DispatchHeadNodeFactory.createMethodCall(context);
+        envNode = new ReadConstantNode(context, sourceSection, "ENV",
+                new LiteralNode(context, sourceSection, getContext().getCoreLibrary().getObjectClass()),
+                LexicalScope.NONE);
         TZ = createString("TZ");
     }
 
     @Override
     public RubyString executeRubyString(VirtualFrame frame) {
-        final Object tz = hashNode.call(frame, getContext().getCoreLibrary().getENV(), "[]", null, TZ);
+        final Object tz = hashNode.call(frame, envNode.execute(frame), "[]", null, TZ);
 
         // TODO CS 4-May-15 not sure how TZ ends up being nil
 

diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -91,9 +91,6 @@ class Rational
   alias :__slash__ :/
 end
 
-ENV['TZ'] = 'UTC'
-
-
 # Wrapper class for Rubinius's exposure of @data within String.
 #
 # We can't use Array directly because we don't currently guarantee that we'll always return the same