Merge branch 'master' into truffle-head

Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java

Author: chrisseaton

core/src/main/java/org/jruby/ext/digest/BubbleBabble.java

@@ -1,5 +1,7 @@
 package org.jruby.ext.digest;
 
+import org.jruby.util.ByteList;
+
 /**
  * Ported from OpenSSH (https://github.com/openssh/openssh-portable/blob/957fbceb0f3166e41b76fdb54075ab3b9cc84cba/sshkey.c#L942-L987)
  *
@@ -32,42 +34,41 @@
 
 public class BubbleBabble {
 
-    public static String bubblebabble(byte[] digestRaw) {
+    public static ByteList bubblebabble(byte[] message, int begin, int length) {
         char[] vowels = new char[]{'a', 'e', 'i', 'o', 'u', 'y'};
         char[] consonants = new char[]{'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm',
                 'n', 'p', 'r', 's', 't', 'v', 'z', 'x'};
 
         int seed = 1;
 
-        StringBuffer retval = new StringBuffer();
-        int rawLen = digestRaw.length;
+        ByteList retval = new ByteList();
 
-        int rounds = (rawLen / 2) + 1;
+        int rounds = (length / 2) + 1;
         retval.append('x');
         for (int i = 0; i < rounds; i++) {
             int idx0, idx1, idx2, idx3, idx4;
 
-            if ((i + 1 < rounds) || (rawLen % 2 != 0)) {
-                idx0 = (((((int) (digestRaw[2 * i])) >> 6) & 3) + seed) % 6;
-                idx1 =   (((int) (digestRaw[2 * i])) >> 2) & 15;
-                idx2 =  ((((int) (digestRaw[2 * i]))  & 3) + (seed / 6)) % 6;
+            if ((i + 1 < rounds) || (length % 2 != 0)) {
+                idx0 = (((((int) (message[begin + 2 * i])) >> 6) & 3) + seed) % 6;
+                idx1 =   (((int) (message[begin + 2 * i])) >> 2) & 15;
+                idx2 =  ((((int) (message[begin + 2 * i]))  & 3) + (seed / 6)) % 6;
                 retval.append(vowels[idx0]);
                 retval.append(consonants[idx1]);
                 retval.append(vowels[idx2]);
                 if ((i + 1) < rounds) {
-                    idx3 = (((int) (digestRaw[(2 * i) + 1])) >> 4) & 15;
-                    idx4 = (((int) (digestRaw[(2 * i) + 1]))) & 15;
+                    idx3 = (((int) (message[begin + (2 * i) + 1])) >> 4) & 15;
+                    idx4 = (((int) (message[begin + (2 * i) + 1]))) & 15;
                     retval.append(consonants[idx3]);
                     retval.append('-');
                     retval.append(consonants[idx4]);
                     seed = ((seed * 5) +
-                            ((((int) (digestRaw[2 * i])) * 7) +
-                                    ((int) (digestRaw[(2 * i) + 1])))) % 36;
+                            ((((int) (message[begin + 2 * i])) * 7) +
+                                    ((int) (message[begin + (2 * i) + 1])))) % 36;
                 }
             }
         }
         retval.append('x');
 
-        return retval.toString();
+        return retval;
     }
 }

core/src/main/java/org/jruby/ext/digest/RubyDigest.java

@@ -157,7 +157,8 @@ public static IRubyObject s_hexencode(IRubyObject recv, IRubyObject arg) {
 
     @JRubyMethod(name = "bubblebabble", required = 1, meta = true)
     public static IRubyObject bubblebabble(IRubyObject recv, IRubyObject arg) {
-        return RubyString.newString(recv.getRuntime(), BubbleBabble.bubblebabble(arg.convertToString().getBytes()));
+        final ByteList bytes = arg.convertToString().getByteList();
+        return RubyString.newString(recv.getRuntime(), BubbleBabble.bubblebabble(bytes.unsafeBytes(), bytes.begin(), bytes.length()));
     }
 
     private static class Metadata {
@@ -336,7 +337,7 @@ public static IRubyObject hexdigest_bang(ThreadContext context, IRubyObject self
         @JRubyMethod(name = "bubblebabble", required = 1, optional = 1, meta = true)
         public static IRubyObject bubblebabble(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block unusedBlock) {
             byte[] digest = recv.callMethod(context, "digest", args, Block.NULL_BLOCK).convertToString().getBytes();
-            return RubyString.newString(recv.getRuntime(), BubbleBabble.bubblebabble(digest));
+            return RubyString.newString(recv.getRuntime(), BubbleBabble.bubblebabble(digest, 0, digest.length));
         }
 
         @JRubyMethod()
@@ -480,7 +481,8 @@ public IRubyObject reset() {
 
         @JRubyMethod()
         public IRubyObject bubblebabble(ThreadContext context) {
-            return RubyString.newString(context.runtime, BubbleBabble.bubblebabble(algo.digest()));
+            final byte[] digest = algo.digest();
+            return RubyString.newString(context.runtime, BubbleBabble.bubblebabble(digest, 0, digest.length));
         }
 
         private void setAlgorithm(Metadata metadata) throws NoSuchAlgorithmException {

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

@@ -293,11 +293,11 @@ public static void checkType(ThreadContext context, IRubyObject x, RubyModule t)
             throw context.runtime.newRuntimeError("bug: undef leaked to the Ruby space");
         }
 
-        xt = x.getMetaClass().getNativeClassIndex();
+        xt = x.getMetaClass().getClassIndex();
 
         // MISSING: special error for T_DATA of a certain type
         if (xt != t.getClassIndex()) {
-            String tname = t.getBaseName();
+            String tname = x.getMetaClass().toString();
             if (tname != null) {
                 throw context.runtime.newTypeError("wrong argument type " + tname + " (expected " + t.getName() + ")");
             }

lib/ruby/truffle/mri/thread.rb

@@ -373,3 +373,12 @@ def num_waiting
 
 # Documentation comments:
 #  - How do you make RDoc inherit documentation from superclass?
+
+# Truffle: define marshal_dump as MRI tests expect it
+[ConditionVariable, Queue].each do |klass|
+  klass.class_exec do
+    def marshal_dump
+      raise TypeError, "can't dump #{self.class}"
+    end
+  end
+end

lib/ruby/truffle/rubysl/README.md

@@ -11,3 +11,4 @@ Commits for each library are:
 * rubysl-pathname `cdf215804c4349353a60226b5c1d71f695d45570`
 * rubysl-tempfile `97c4464b4d235f773aab537fbc80608a730a58fc`
 * rubysl-socket `3a8c965b36643208da81360ddb4ca7ba867cd3c4`
+* rubysl-securerandom `00e31daaf492f7987aa50750dfc3ebc8e8c42a7e`

lib/ruby/truffle/rubysl/rubysl-securerandom/LICENSE

@@ -0,0 +1,25 @@
+Copyright (c) 2013, Brian Shirai
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the library nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

lib/ruby/truffle/rubysl/rubysl-securerandom/lib/rubysl/securerandom.rb

@@ -0,0 +1,2 @@
+require "rubysl/securerandom/securerandom"
+require "rubysl/securerandom/version"