jruby · May 25, 2015 · May 25, 2015 · May 25, 2015 · May 26, 2015 · May 26, 2015
diff --git a/spec/tags/ruby/core/hash/reject_tags.txt b/spec/tags/ruby/core/hash/reject_tags.txt
@@ -1 +1,2 @@
 fails:Hash#reject taints the resulting hash
+fails:Hash#reject with extra state does not taint the resulting hash
diff --git a/spec/truffle/tags/library/csv/parse_tags.txt b/spec/truffle/tags/library/csv/parse_tags.txt
diff --git a/spec/truffle/tags/library/csv/readlines_tags.txt b/spec/truffle/tags/library/csv/readlines_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/TruffleInteropNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/TruffleInteropNodes.java
@@ -20,7 +20,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.interop.TruffleGlobalScope;
 import com.oracle.truffle.interop.messages.Argument;
 import com.oracle.truffle.interop.messages.Execute;
 import com.oracle.truffle.interop.messages.GetSize;
@@ -34,20 +33,9 @@
 import com.oracle.truffle.interop.messages.Write;
 import com.oracle.truffle.interop.node.ForeignObjectAccessNode;
 
-
 @CoreClass(name = "Truffle::Interop")
 public abstract class TruffleInteropNodes {
 
-	private static TruffleGlobalScope globalScope;
-
-	public static void setGlobalScope(TruffleGlobalScope globalScope) {
-		TruffleInteropNodes.globalScope = globalScope;
-	}
-
-	public static TruffleGlobalScope getGlobalScope() {
-		return globalScope;
-	}
-
     @CoreMethod(names = "interop_to_ruby_primitive", isModuleFunction = true, needsSelf = false, required = 1)
     public abstract static class InteropToRubyNode extends CoreMethodArrayArgumentsNode {
 
@@ -314,11 +302,12 @@ public Object executeForeign(VirtualFrame frame, TruffleObject receiver) {
         }
 
     }
-
+
+    /*
+
     @CoreMethod(names = "export", isModuleFunction = true, needsSelf = false, required = 2)
     public abstract static class ExportNode extends CoreMethodArrayArgumentsNode {
 
-
         public ExportNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
@@ -338,7 +327,7 @@ public Object export(VirtualFrame frame, RubyString name,  TruffleObject object)
         protected static String rubyStringToString(RubyString rubyString) {
         	return rubyString.toString();
         }
-        
+
         protected TruffleGlobalScope getGlobal() {
         	return globalScope;
         }
@@ -366,10 +355,12 @@ public Object importObject(VirtualFrame frame, RubyString name) {
         protected FrameSlot getSlot(RubyString rubyString) {
         	return globalScope.getFrameSlot(rubyString.toString());
         }
-        
+
         protected TruffleGlobalScope getGlobal() {
         	return globalScope;
         }
 
     }
+
+    */
 }
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
@@ -10,6 +10,7 @@
 package org.jruby.truffle.nodes.rubinius;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
@@ -46,7 +47,7 @@ public RubyTime timeSNow(VirtualFrame frame, RubyClass timeClass) {
             return new RubyTime(timeClass, now(readTimeZoneNode.executeRubyString(frame)), nil());
         }
 
-        @CompilerDirectives.TruffleBoundary
+        @TruffleBoundary
         private DateTime now(RubyString timeZone) {
             return DateTime.now(org.jruby.RubyTime.getTimeZoneFromTZString(getContext().getRuntime(), timeZone.toString()));
         }
@@ -68,7 +69,7 @@ public RubyTime timeSDup(RubyTime other) {
 
     }
 
-    @RubiniusPrimitive(name = "time_s_specific", needsSelf = false)
+    @RubiniusPrimitive(name = "time_s_specific", needsSelf = false, lowerFixnumParameters = { 0, 1 })
     public static abstract class TimeSSpecificPrimitiveNode extends RubiniusPrimitiveNode {
 
         @Child private ReadTimeZoneNode readTimeZoneNode;
@@ -78,48 +79,27 @@ public TimeSSpecificPrimitiveNode(RubyContext context, SourceSection sourceSecti
             readTimeZoneNode = new ReadTimeZoneNode(context, sourceSection);
         }
 
-        @Specialization(guards = {"isTrue(isUTC)", "isNil(offset)"})
-        public RubyTime timeSSpecificUTC(long seconds, long nanoseconds, boolean isUTC, Object offset) {
-            return timeSSpecificUTC((int) seconds, (int) nanoseconds, isUTC, offset);
-        }
-
-        @Specialization(guards = {"isTrue(isUTC)", "isNil(offset)"})
-        public RubyTime timeSSpecificUTC(long seconds, int nanoseconds, boolean isUTC, Object offset) {
-            return timeSSpecificUTC((int) seconds, nanoseconds, isUTC, offset);
-        }
-
-        @Specialization(guards = {"isTrue(isUTC)", "isNil(offset)"})
+        @Specialization(guards = { "isTrue(isUTC)", "isNil(offset)" })
         public RubyTime timeSSpecificUTC(int seconds, int nanoseconds, boolean isUTC, Object offset) {
             // TODO(CS): overflow checks needed?
             final long milliseconds = seconds * 1_000L + (nanoseconds / 1_000_000);
             return new RubyTime(getContext().getCoreLibrary().getTimeClass(), time(milliseconds), nil());
         }
 
-
-        @Specialization(guards = {"!isTrue(isUTC)", "isNil(offset)"})
-        public RubyTime timeSSpecific(VirtualFrame frame, long seconds, long nanoseconds, boolean isUTC, Object offset) {
-            return timeSSpecific(frame, (int) seconds, (int) nanoseconds, isUTC, offset);
-        }
-
-        @Specialization(guards = {"!isTrue(isUTC)", "isNil(offset)"})
-        public RubyTime timeSSpecific(VirtualFrame frame, long seconds, int nanoseconds, boolean isUTC, Object offset) {
-            return timeSSpecific(frame, (int) seconds, nanoseconds, isUTC, offset);
-        }
-
-        @Specialization(guards = {"!isTrue(isUTC)", "isNil(offset)"})
+        @Specialization(guards = { "!isTrue(isUTC)", "isNil(offset)" })
         public RubyTime timeSSpecific(VirtualFrame frame, int seconds, int nanoseconds, boolean isUTC, Object offset) {
             // TODO(CS): overflow checks needed?
             final long milliseconds = (long) seconds * 1_000 + ((long) nanoseconds / 1_000_000);
-            return new RubyTime(getContext().getCoreLibrary().getTimeClass(), time(milliseconds, readTimeZoneNode.executeRubyString(frame)), offset);
+            return new RubyTime(getContext().getCoreLibrary().getTimeClass(), localtime(milliseconds, readTimeZoneNode.executeRubyString(frame)), offset);
         }
 
-        @CompilerDirectives.TruffleBoundary
-        public DateTime time(long milliseconds) {
+        @TruffleBoundary
+        private DateTime time(long milliseconds) {
             return new DateTime(milliseconds, DateTimeZone.UTC);
         }
 
-        @CompilerDirectives.TruffleBoundary
-        private DateTime time(long milliseconds, RubyString timeZone) {
+        @TruffleBoundary
+        private DateTime localtime(long milliseconds, RubyString timeZone) {
             return new DateTime(milliseconds, org.jruby.RubyTime.getTimeZoneFromTZString(getContext().getRuntime(), timeZone.toString()));
         }
 
@@ -160,7 +140,7 @@ public TimeDecomposePrimitiveNode(RubyContext context, SourceSection sourceSecti
             super(context, sourceSection);
         }
 
-        @CompilerDirectives.TruffleBoundary
+        @TruffleBoundary
         @Specialization
         public RubyArray timeDecompose(RubyTime time) {
             final DateTime dateTime = time.getDateTime();
@@ -203,7 +183,7 @@ public TimeStrftimePrimitiveNode(RubyContext context, SourceSection sourceSectio
             super(context, sourceSection);
         }
 
-        @CompilerDirectives.TruffleBoundary
+        @TruffleBoundary
         @Specialization
         public RubyString timeStrftime(RubyTime time, RubyString format) {
             final RubyDateFormatter rdf = getContext().getRuntime().getCurrentContext().getRubyDateFormatter();

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.runtime;
+
+import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.source.Source;
+
+import java.io.IOException;
+
+public class RubyLanguage extends TruffleLanguage {
+
+    private final RubyContext context;
+
+    public RubyLanguage(Env env, RubyContext context) {
+        super(env);
+        this.context = context;
+    }
+
+    @Override
+    protected Object eval(Source source) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected Object findExportedSymbol(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected Object getLanguageGlobal() {
+        return context.getCoreLibrary().getObjectClass();
+    }
+
+    @Override
+    protected boolean isObjectOfLanguage(Object o) {
+        throw new UnsupportedOperationException();
+    }
+
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		fails:Hash#reject taints the resulting hash
		fails:Hash#reject with extra state does not taint the resulting hash