Merge branch 'master' into truffle-head

Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java

Author: chrisseaton

core/src/main/java/org/jruby/RubyString.java

@@ -4148,39 +4148,19 @@ public IRubyObject chop_bang(ThreadContext context) {
     public IRubyObject chop19(ThreadContext context) {
         Ruby runtime = context.runtime;
         if (value.getRealSize() == 0) return newEmptyString(runtime, getMetaClass(), value.getEncoding()).infectBy(this);
-        return makeShared19(runtime, 0, choppedLength19(runtime));
+        return makeShared19(runtime, 0, StringSupport.choppedLength19(this, runtime));
     }
 
     @JRubyMethod(name = "chop!")
     public IRubyObject chop_bang19(ThreadContext context) {
         modifyCheck();
         Ruby runtime = context.runtime;
         if (value.getRealSize() == 0) return runtime.getNil();
-        view(0, choppedLength19(runtime));
+        view(0, StringSupport.choppedLength19(this, runtime));
         if (getCodeRange() != CR_7BIT) clearCodeRange();
         return this;
     }
 
-    private int choppedLength19(Ruby runtime) {
-        int p = value.getBegin();
-        int end = p + value.getRealSize();
-
-        if (p > end) return 0;
-        byte bytes[] = value.getUnsafeBytes();
-        Encoding enc = value.getEncoding();
-
-        int s = enc.prevCharHead(bytes, p, end, end);
-        if (s == -1) return 0;
-        if (s > p && codePoint(runtime, enc, bytes, s, end) == '\n') {
-            int s2 = enc.prevCharHead(bytes, p, s, end);
-            if (s2 != -1 && codePoint(runtime, enc, bytes, s2, end) == '\r') s = s2;
-        }
-        return s - p;
-    }
-
-    /** rb_str_chop
-     *
-     */
     public RubyString chomp(ThreadContext context) {
         return chomp19(context);
     }

core/src/main/java/org/jruby/util/StringSupport.java

@@ -1324,4 +1324,25 @@ public static CodeRangeable delete_bangCommon19(CodeRangeable rubyString, Ruby r
 
         return modify ? rubyString : null;
     }
+
+    /**
+     * rb_str_chop
+     */
+    public static int choppedLength19(CodeRangeable rubyString, Ruby runtime) {
+        final ByteList value = rubyString.getByteList();
+        int p = value.getBegin();
+        int end = p + value.getRealSize();
+
+        if (p > end) return 0;
+        byte bytes[] = value.getUnsafeBytes();
+        Encoding enc = value.getEncoding();
+
+        int s = enc.prevCharHead(bytes, p, end, end);
+        if (s == -1) return 0;
+        if (s > p && codePoint(runtime, enc, bytes, s, end) == '\n') {
+            int s2 = enc.prevCharHead(bytes, p, s, end);
+            if (s2 != -1 && codePoint(runtime, enc, bytes, s2, end) == '\r') s = s2;
+        }
+        return s - p;
+    }
 }

lib/ruby/truffle/shims/stringio.rb

@@ -10,8 +10,8 @@
 
 class StringIO
 
-  def initialize(string, mode)
-    @lines = string.split(/\n/).reject { |line| line.empty? }
+  def initialize(string=nil, mode=nil)
+    @lines = (string || '').split(/\n/).reject { |line| line.empty? }
   end
 
   def gets

spec/truffle/tags/core/array/delete_at_tags.txt

@@ -1,6 +1,4 @@
 fails:Array#hash returns the same hash for equal recursive arrays
 fails:Array#hash returns the same hash for equal recursive arrays through hashes
 fails:Array#hash calls to_int on result of calling hash on each element
-fails:Array#hash returns same hash code for arrays with the same content
-fails:Array#hash returns the same value if arrays are #eql?
 fails:Array#hash properly handles recursive arrays

spec/truffle/tags/core/array/hash_tags.txt

@@ -1,4 +1,3 @@
-fails:Array#sort sorts reverse-sorted Arrays
 fails:Array#sort may take a block which is used to determine the order of objects a and b described as -1, 0 or +1
 fails:Array#sort raises an error when a given block returns nil
 fails:Array#sort completes when supplied a block that always returns the same result

spec/truffle/tags/core/array/sort_tags.txt

@@ -1,3 +1,2 @@
-fails:BasicObject#instance_exec is a public instance method
 fails:BasicObject#instance_exec sets self to the receiver in the context of the passed block
 fails:BasicObject#instance_exec passes arguments to the block