Merge branch 'master' into truffle-head

Don't merge bin/jruby.bash
jruby · Feb 2, 2016 · 42ea649 · 42ea649
2 parents 58fbf9d + 5bac239
commit 42ea649
Showing 15 changed files with 37 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/ir/passes/LocalOptimizationPass.java b/core/src/main/java/org/jruby/ir/passes/LocalOptimizationPass.java
@@ -82,7 +82,6 @@ public static Instr optInstr(IRScope s, Instr instr, Map<Operand,Operand> valueM
             if (!instr.hasSideEffects()) {
                 if (instr instanceof CopyInstr) {
                     if (res.equals(val) && instr.canBeDeletedFromScope(s)) {
-                        System.out.println("DEAD: marking instr dead!!");
                         instr.markDead();
                     }
                 } else {

diff --git a/spec/truffle/tags/core/dir/pwd_tags.txt b/spec/truffle/tags/core/dir/pwd_tags.txt
@@ -1 +1,2 @@
 fails:Dir.pwd correctly displays dirs with unicode characters in them
+fails:Dir.pwd correctly handles dirs with unicode characters in them
diff --git a/spec/truffle/tags/core/io/sync_tags.txt b/spec/truffle/tags/core/io/sync_tags.txt
@@ -0,0 +1 @@
+fails:IO#sync is false by default for STDOUT
diff --git a/spec/truffle/tags/core/io/write_nonblock_tags.txt b/spec/truffle/tags/core/io/write_nonblock_tags.txt
@@ -9,3 +9,6 @@ fails:IO#write_nonblock does not warn if called after IO#read
 fails:IO#write_nonblock writes to the current position after IO#read
 fails:IO#write_nonblock advances the file position by the count of given bytes
 fails:IO#write_nonblock raises IOError on closed stream
+fails:IO#write_nonblock raises EAGAIN or a subclass when the write would block
+fails:IO#write_nonblock raises an exception extending IO::WaitWritable when the write would block
+fails:IO#write_nonblock raises IO::EAGAINWaitWritable when the operation would block
diff --git a/spec/truffle/tags/core/kernel/Float_tags.txt b/spec/truffle/tags/core/kernel/Float_tags.txt
@@ -10,3 +10,7 @@ fails:Kernel#Float raises an ArgumentError for a String with an embedded \0
 fails:Kernel#Float raises an ArgumentError for a String with a trailing \0
 fails:Kernel#Float allows embedded _ in a number on either side of the e
 fails:Kernel#Float allows embedded _ in a number on either side of the E
+fails:Kernel.Float for hexadecimal literals with binary exponent allows embedded _ in a number on either side of the p
+fails:Kernel.Float for hexadecimal literals with binary exponent allows embedded _ in a number on either side of the P
+fails:Kernel#Float for hexadecimal literals with binary exponent allows embedded _ in a number on either side of the p
+fails:Kernel#Float for hexadecimal literals with binary exponent allows embedded _ in a number on either side of the P
diff --git a/spec/truffle/tags/core/range/inspect_tags.txt b/spec/truffle/tags/core/range/inspect_tags.txt
@@ -0,0 +1,2 @@
+fails:Range#inspect returns a tainted string if either end is tainted
+fails:Range#inspect returns a untrusted string if either end is untrusted
diff --git a/spec/truffle/tags/core/range/to_s_tags.txt b/spec/truffle/tags/core/range/to_s_tags.txt
@@ -0,0 +1,2 @@
+fails:Range#to_s returns a tainted string if either end is tainted
+fails:Range#to_s returns a untrusted string if either end is untrusted
diff --git a/spec/truffle/tags/core/string/split_tags.txt b/spec/truffle/tags/core/string/split_tags.txt
@@ -1 +1,3 @@
 fails:String#split with String when limit is zero ignores leading and continuous whitespace when string is a single space
+fails:String#split with String splits between characters when its argument is an empty string
+fails:String#split with Regexp splits between characters when regexp matches a zero-length string
diff --git a/spec/truffle/tags/library/zlib/deflate/deflate_tags.txt b/spec/truffle/tags/library/zlib/deflate/deflate_tags.txt
@@ -0,0 +1,5 @@
+fails(OOM):Zlib::Deflate#deflate without break deflates chunked data
+fails(OOM):Zlib::Deflate#deflate with break deflates only first chunk
+fails(OOM):Zlib::Deflate#deflate with break deflates chunked data with final chunk
+fails(OOM):Zlib::Deflate#deflate with break deflates chunked data without errors
+fails:Zlib::Deflate.deflate deflates chunked data
diff --git a/spec/truffle/tags/library/zlib/inflate/finish_tags.txt b/spec/truffle/tags/library/zlib/inflate/finish_tags.txt
@@ -0,0 +1 @@
+fails:Zlib::Inflate#finish inflates chunked data
diff --git a/spec/truffle/tags/library/zlib/inflate/inflate_tags.txt b/spec/truffle/tags/library/zlib/inflate/inflate_tags.txt
@@ -1,2 +1,3 @@
 fails:Zlib::Inflate#inflate works in pass-through mode, once finished
 fails:Zlib::Inflate.inflate properly handles excessive data, byte-by-byte
+fails:Zlib::Inflate#inflate without break inflates chunked data
diff --git a/tool/jruby_eclipse b/tool/jruby_eclipse
@@ -4,10 +4,13 @@
 
 M2REPO = "#{Dir.home}/.m2/repository"
 
-TRUFFLEJARS = %w[
-  /com/oracle/truffle/truffle-api/0.10/truffle-api-0.10.jar
-  /com/oracle/truffle/truffle-debug/0.10/truffle-debug-0.10.jar
+TRUFFLE_VERSION = "0.11"
+
+TRUFFLEJARS = %W[
+  com/oracle/truffle/truffle-api/#{TRUFFLE_VERSION}/truffle-api-#{TRUFFLE_VERSION}.jar
+  com/oracle/truffle/truffle-debug/#{TRUFFLE_VERSION}/truffle-debug-#{TRUFFLE_VERSION}.jar
 ].map { |jar| "#{M2REPO}/#{jar}" }
+
 SNAKEYAMLJAR = "#{M2REPO}/org/yaml/snakeyaml/1.14/snakeyaml-1.14.jar"
 ANTLR4JAR = "#{M2REPO}/org/antlr/antlr4-runtime/4.5/antlr4-runtime-4.5.jar"
 

diff --git a/truffle/.factorypath b/truffle/.factorypath
@@ -0,0 +1,4 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-api/0.11/truffle-api-0.11.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-dsl-processor/0.11/truffle-dsl-processor-0.11.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/truffle/src/main/java/org/jruby/truffle/core/SymbolNodes.java b/truffle/src/main/java/org/jruby/truffle/core/SymbolNodes.java
@@ -19,6 +19,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
+
+import org.jruby.runtime.ArgumentDescriptor;
 import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.language.arguments.CheckArityNode;
 import org.jruby.truffle.language.control.SequenceNode;
@@ -137,8 +139,8 @@ protected DynamicObject createProc(VirtualFrame frame, DynamicObject symbol) {
                     .getCallNode().getEncapsulatingSourceSection();
 
             final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(
-                    sourceSection, null, Arity.NO_ARGUMENTS, Layouts.SYMBOL.getString(symbol),
-                    true, null, false, false, false);
+                    sourceSection, null, Arity.AT_LEAST_ONE, Layouts.SYMBOL.getString(symbol),
+                    true, ArgumentDescriptor.ANON_REST, false, false, false);
 
             final RubyRootNode rootNode = new RubyRootNode(
                     getContext(), sourceSection,

diff --git a/truffle/src/main/ruby/core/float.rb b/truffle/src/main/ruby/core/float.rb
@@ -42,7 +42,7 @@ class Float
   EPSILON    = 2.2204460492503131e-16
   RADIX      = 2
   ROUNDS     = 1
-  MIN        = 4.9E-324
+  MIN        = 2.2250738585072014e-308
   MAX        = 1.7976931348623157e+308
   MIN_EXP    = -1021
   MAX_EXP    = 1024
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		fails:Dir.pwd correctly displays dirs with unicode characters in them
		fails:Dir.pwd correctly handles dirs with unicode characters in them
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:Range#inspect returns a tainted string if either end is tainted
		fails:Range#inspect returns a untrusted string if either end is untrusted
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:Range#to_s returns a tainted string if either end is tainted
		fails:Range#to_s returns a untrusted string if either end is untrusted
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:Zlib::Inflate#finish inflates chunked data