jruby · Jun 29, 2016 · Jun 29, 2016 · Jun 29, 2016 · Jun 29, 2016 · Jun 29, 2016
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -465,7 +465,7 @@ private boolean checkStreamSyntax(Ruby runtime, InputStream in, String filename)
         } catch (RaiseException re) {
             if (re.getException().getMetaClass().getBaseName().equals("SyntaxError")) {
                 context.setErrorInfo($ex);
-                config.getError().println("SyntaxError in " + re.getException().message(runtime.getCurrentContext()));
+                config.getError().println("SyntaxError in " + re.getException().message(context));
                 return false;
             }
             throw re;

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -1240,10 +1240,10 @@ private void init() {
         threadService.initMainThread();
 
         // Get the main threadcontext (gets constructed for us)
-        ThreadContext tc = getCurrentContext();
+        final ThreadContext context = getCurrentContext();
 
         // Construct the top-level execution frame and scope for the main thread
-        tc.prepareTopLevel(objectClass, topSelf);
+        context.prepareTopLevel(objectClass, topSelf);
 
         // Initialize all the core classes
         bootstrap();
@@ -1259,14 +1259,14 @@ private void init() {
         // FIXME: This registers itself into static scope as a side-effect.  Let's make this
         // relationship handled either more directly or through a descriptice method
         // FIXME: We need a failing test case for this since removing it did not regress tests
-        new IRScriptBody(irManager, "", tc.getCurrentScope().getStaticScope());
+        new IRScriptBody(irManager, "", context.getCurrentScope().getStaticScope());
 
         // Initialize the "dummy" class used as a marker
         dummyClass = new RubyClass(this, classClass);
-        dummyClass.freeze(tc);
+        dummyClass.freeze(context);
 
         // Create global constants and variables
-        RubyGlobal.createGlobals(tc, this);
+        RubyGlobal.createGlobals(context, this);
 
         // Prepare LoadService and load path
         getLoadService().init(config.getLoadPaths());
@@ -1291,9 +1291,8 @@ && getInstanceConfig().getCompileMode() != CompileMode.TRUFFLE) {
             isRestricted.set(null, false);
             isRestricted.setAccessible(false);
         } catch (Exception e) {
-            if (isDebug()) {
-                System.err.println("unable to enable unlimited-strength crypto");
-                e.printStackTrace();
+            if (isDebug() || LOG.isDebugEnabled()) {
+                LOG.debug("unable to enable unlimited-strength crypto", e);
             }
         }
 
@@ -1315,7 +1314,7 @@ && getInstanceConfig().getCompileMode() != CompileMode.TRUFFLE) {
             initRubyPreludes();
 
             // everything booted, so SizedQueue should be available; set up root fiber
-            ThreadFiber.initRootFiber(tc);
+            ThreadFiber.initRootFiber(context);
         }
 
         if(config.isProfiling()) {
@@ -1340,7 +1339,7 @@ && getInstanceConfig().getCompileMode() != CompileMode.TRUFFLE) {
         // Require in all libraries specified on command line
         if (getInstanceConfig().getCompileMode() != CompileMode.TRUFFLE) {
             for (String scriptName : config.getRequiredLibraries()) {
-                topSelf.callMethod(getCurrentContext(), "require", RubyString.newString(this, scriptName));
+                topSelf.callMethod(context, "require", RubyString.newString(this, scriptName));
             }
         }
     }
@@ -4362,18 +4361,19 @@ public ExecRecursiveParams() {}
 
     private void recursivePush(IRubyObject list, IRubyObject obj, IRubyObject paired_obj) {
         IRubyObject pair_list;
-        if(paired_obj == null) {
-            ((RubyHash)list).op_aset(getCurrentContext(), obj, getTrue());
-        } else if((pair_list = ((RubyHash)list).fastARef(obj)) == null) {
-            ((RubyHash)list).op_aset(getCurrentContext(), obj, paired_obj);
+        final ThreadContext context = getCurrentContext();
+        if (paired_obj == null) {
+            ((RubyHash) list).op_aset(context, obj, getTrue());
+        } else if ((pair_list = ((RubyHash)list).fastARef(obj)) == null) {
+            ((RubyHash) list).op_aset(context, obj, paired_obj);
         } else {
-            if(!(pair_list instanceof RubyHash)) {
+            if (!(pair_list instanceof RubyHash)) {
                 IRubyObject other_paired_obj = pair_list;
                 pair_list = RubyHash.newHash(this);
-                ((RubyHash)pair_list).op_aset(getCurrentContext(), other_paired_obj, getTrue());
-                ((RubyHash)list).op_aset(getCurrentContext(), obj, pair_list);
+                ((RubyHash) pair_list).op_aset(context, other_paired_obj, getTrue());
+                ((RubyHash) list).op_aset(context, obj, pair_list);
             }
-            ((RubyHash)pair_list).op_aset(getCurrentContext(), paired_obj, getTrue());
+            ((RubyHash)pair_list).op_aset(context, paired_obj, getTrue());
         }
     }
 

diff --git a/core/src/main/java/org/jruby/RubyClassPathVariable.java b/core/src/main/java/org/jruby/RubyClassPathVariable.java
@@ -105,23 +105,25 @@ public IRubyObject size() {
 
     @JRubyMethod
     public IRubyObject each(Block block) {
-        URL[] urls = getRuntime().getJRubyClassLoader().getURLs();
-        ThreadContext ctx = getRuntime().getCurrentContext();
+        final ThreadContext context = getRuntime().getCurrentContext();
+        URL[] urls = context.runtime.getJRubyClassLoader().getURLs();
         for(int i=0,j=urls.length;i<j;i++) {
-            block.yield(ctx, getRuntime().newString(urls[i].toString()));
+            block.yield(context, context.runtime.newString(urls[i].toString()));
         }
-        return getRuntime().getNil();
+        return context.nil;
     }
 
     @Override
     @JRubyMethod
     public IRubyObject to_s() {
-        return callMethod(getRuntime().getCurrentContext(), "to_a").callMethod(getRuntime().getCurrentContext(), "to_s");
+        final ThreadContext context = getRuntime().getCurrentContext();
+        return callMethod(context, "to_a").callMethod(context, "to_s");
     }
 
     @Override
     @JRubyMethod(name = "inspect")
     public IRubyObject inspect() {
-        return callMethod(getRuntime().getCurrentContext(), "to_a").callMethod(getRuntime().getCurrentContext(), "inspect");
+        final ThreadContext context = getRuntime().getCurrentContext();
+        return callMethod(context, "to_a").callMethod(context, "inspect");
     }
 }// RubyClassPathVariable
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1157,23 +1157,20 @@ private static RaiseException uncaughtThrow(Ruby runtime, IRubyObject tag, IRuby
 
     @JRubyMethod(module = true, visibility = PRIVATE)
     public static IRubyObject warn(ThreadContext context, IRubyObject recv, IRubyObject message) {
-        Ruby runtime = context.runtime;
+        final Ruby runtime = context.runtime;
 
         if (runtime.warningsEnabled()) {
             IRubyObject out = runtime.getGlobalVariables().get("$stderr");
             Helpers.invoke(context, out, "write", message);
             Helpers.invoke(context, out, "write", runtime.getGlobalVariables().getDefaultSeparator());
         }
-        return runtime.getNil();
+        return context.nil;
     }
 
     @JRubyMethod(module = true, required = 1, rest = true, visibility = PRIVATE)
     public static IRubyObject warn(ThreadContext context, IRubyObject recv, IRubyObject... messages) {
-        Ruby runtime = context.runtime;
-
         for (IRubyObject message : messages) warn(context, recv, message);
-
-        return runtime.getNil();
+        return context.nil;
     }
 
     @JRubyMethod(module = true, visibility = PRIVATE)
@@ -1194,7 +1191,7 @@ public static IRubyObject trace_var(ThreadContext context, IRubyObject recv, IRu
         String var = args[0].toString();
         // ignore if it's not a global var
         if (var.charAt(0) != '$') {
-            return context.runtime.getNil();
+            return context.nil;
         }
         if (args.length == 1) {
             proc = RubyProc.newProc(context.runtime, block, Block.Type.PROC);
@@ -1205,7 +1202,7 @@ public static IRubyObject trace_var(ThreadContext context, IRubyObject recv, IRu
 
         context.runtime.getGlobalVariables().setTraceVar(var, proc);
 
-        return context.runtime.getNil();
+        return context.nil;
     }
 
     @JRubyMethod(required = 1, optional = 1, module = true, visibility = PRIVATE)
@@ -1217,11 +1214,11 @@ public static IRubyObject untrace_var(ThreadContext context, IRubyObject recv, I
 
         // ignore if it's not a global var
         if (var.charAt(0) != '$') {
-            return context.runtime.getNil();
+            return context.nil;
         }
 
         if (args.length > 1) {
-            ArrayList<IRubyObject> success = new ArrayList<IRubyObject>();
+            ArrayList<IRubyObject> success = new ArrayList<>(args.length);
             for (int i = 1; i < args.length; i++) {
                 if (context.runtime.getGlobalVariables().untraceVar(var, args[i])) {
                     success.add(args[i]);
@@ -1232,7 +1229,7 @@ public static IRubyObject untrace_var(ThreadContext context, IRubyObject recv, I
             context.runtime.getGlobalVariables().untraceVar(var);
         }
 
-        return context.runtime.getNil();
+        return context.nil;
     }
 
     @JRubyMethod(required = 1, optional = 1, reads = VISIBILITY)
@@ -1259,8 +1256,9 @@ public static IRubyObject define_singleton_method(ThreadContext context, IRubyOb
         }
     }
 
+    @JRubyMethod(name = "proc", module = true, visibility = PRIVATE)
     public static RubyProc proc(ThreadContext context, IRubyObject recv, Block block) {
-        return proc_1_9(context, recv, block);
+        return context.runtime.newProc(Block.Type.PROC, block);
     }
 
     @JRubyMethod(module = true, visibility = PRIVATE)
@@ -1271,9 +1269,9 @@ public static RubyProc lambda(ThreadContext context, IRubyObject recv, Block blo
         return context.runtime.newProc(type, block);
     }
 
-    @JRubyMethod(name = "proc", module = true, visibility = PRIVATE)
+    @Deprecated
     public static RubyProc proc_1_9(ThreadContext context, IRubyObject recv, Block block) {
-        return context.runtime.newProc(Block.Type.PROC, block);
+        return proc(context, recv, block);
     }
 
     @JRubyMethod(name = "loop", module = true, visibility = PRIVATE)

diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -525,25 +525,27 @@ public static IRubyObject newInstance(IRubyObject recv, IRubyObject[] args, Bloc
      * subclassed, then calling start in that subclass will not invoke the
      * subclass's initialize method.
      */
-    public static RubyThread start(IRubyObject recv, IRubyObject[] args, Block block) {
-        return start19(recv, args, block);
-    }
-
     @JRubyMethod(rest = true, name = "start", meta = true)
-    public static RubyThread start19(IRubyObject recv, IRubyObject[] args, Block block) {
-        Ruby runtime = recv.getRuntime();
+    public static RubyThread start(IRubyObject recv, IRubyObject[] args, Block block) {
         // The error message may appear incongruous here, due to the difference
         // between JRuby's Thread model and MRI's.
         // We mimic MRI's message in the name of compatibility.
-        if (! block.isGiven()) throw runtime.newArgumentError("tried to create Proc object without a block");
+        if (! block.isGiven()) {
+            throw recv.getRuntime().newArgumentError("tried to create Proc object without a block");
+        }
         return startThread(recv, args, false, block);
     }
 
+    @Deprecated
+    public static RubyThread start19(IRubyObject recv, IRubyObject[] args, Block block) {
+        return start(recv, args, block);
+    }
+
     public static RubyThread adopt(IRubyObject recv, Thread t) {
-        return adoptThread(recv, t, Block.NULL_BLOCK);
+        return adoptThread(recv, t);
     }
 
-    private static RubyThread adoptThread(final IRubyObject recv, Thread t, Block block) {
+    private static RubyThread adoptThread(final IRubyObject recv, Thread t) {
         final Ruby runtime = recv.getRuntime();
         final RubyThread rubyThread = new RubyThread(runtime, (RubyClass) recv);
 

diff --git a/core/src/main/java/org/jruby/internal/runtime/NativeThread.java b/core/src/main/java/org/jruby/internal/runtime/NativeThread.java
@@ -37,16 +37,17 @@
  * @author cnutter
  */
 public class NativeThread implements ThreadLike {
-    private Reference<Thread> nativeThread;
-    public RubyThread rubyThread;
-
+    private final Reference<Thread> nativeThread;
+    public final RubyThread rubyThread;
+
+    @Deprecated
     public NativeThread(RubyThread rubyThread, IRubyObject[] args, Block block) {
         throw new RuntimeException();
     }
 
     public NativeThread(RubyThread rubyThread, Thread nativeThread) {
         this.rubyThread = rubyThread;
-        this.nativeThread = new WeakReference<Thread>(nativeThread);
+        this.nativeThread = new WeakReference<>(nativeThread);
     }
 
     public void start() {
@@ -98,7 +99,7 @@ public boolean isInterrupted() {
         return false;
     }
 
-    public Thread getThread() {
+    public final Thread getThread() {
         return nativeThread.get();
     }
 

diff --git a/core/src/main/java/org/jruby/internal/runtime/ThreadService.java b/core/src/main/java/org/jruby/internal/runtime/ThreadService.java
@@ -246,7 +246,7 @@ public synchronized RubyThread[] getActiveRubyThreads() {
     	// all threads in ruby thread group plus main thread
 
         synchronized(rubyThreadMap) {
-            List<RubyThread> rtList = new ArrayList<RubyThread>(rubyThreadMap.size());
+            List<RubyThread> rtList = new ArrayList<>(rubyThreadMap.size());
 
             for (Map.Entry<Object, RubyThread> entry : rubyThreadMap.entrySet()) {
                 Object key = entry.getKey();
@@ -267,10 +267,7 @@ public synchronized RubyThread[] getActiveRubyThreads() {
                 rtList.add(entry.getValue());
             }
 
-            RubyThread[] rubyThreads = new RubyThread[rtList.size()];
-            rtList.toArray(rubyThreads);
-
-            return rubyThreads;
+            return rtList.toArray(new RubyThread[rtList.size()]);
         }
     }
 

diff --git a/core/src/main/java/org/jruby/ir/interpreter/Profiler.java b/core/src/main/java/org/jruby/ir/interpreter/Profiler.java
@@ -95,7 +95,7 @@ private static void analyzeProfile() {
             for (IRScope s: calledScopes) {
                 c = scopeCounts.get(s);
                 if (c == null) {
-                    c = new Long(0);
+                    c = Long.valueOf(0);
                     scopeCounts.put(s, c);
                 }
 

diff --git a/mx.jruby/mx_jruby.py b/mx.jruby/mx_jruby.py
@@ -101,23 +101,23 @@ def build(self):
         maven_version_arg = '-Dtruffle.version=' + truffle_commit
         maven_repo_arg = '-Dmaven.repo.local=' + mavenDir
 
-        mx.run_mx(['maven-install', '--repo', mavenDir, '--only', 'TRUFFLE_API,TRUFFLE_DEBUG'], suite=truffle)
+        mx.run_mx(['maven-install', '--repo', mavenDir, '--only', 'TRUFFLE_API,TRUFFLE_DEBUG,TRUFFLE_DSL_PROCESSOR,TRUFFLE_TCK'], suite=truffle)
 
         open(os.path.join(rubyDir, 'VERSION'), 'w').write('graal-vm\n')
 
         # Build jruby-truffle
 
         env = {'JRUBY_BUILD_MORE_QUIET': 'true'}
 
-        mx.run_maven(['-q', '--version', maven_repo_arg], nonZeroIsFatal=False, cwd=rubyDir, env=env)
+        mx.run_maven([ '--version', maven_repo_arg], nonZeroIsFatal=False, cwd=rubyDir, env=env)
 
         mx.log('Building without tests')
 
-        mx.run_maven(['-q', '-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)
+        mx.run_maven(['-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)
 
         mx.log('Building complete version')
 
-        mx.run_maven(['-q', '-Pcomplete', '-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)
+        mx.run_maven(['-Pcomplete', '-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)
         mx.run(['zip', '-d', 'maven/jruby-complete/target/jruby-complete-graal-vm.jar', 'META-INF/jruby.home/lib/*'], cwd=rubyDir)
         mx.run(['bin/jruby', 'bin/gem', 'install', 'bundler', '-v', '1.10.6'], cwd=rubyDir)
         mx.log('...finished build of {}'.format(self.subject))

diff --git a/mx.jruby/suite.py b/mx.jruby/suite.py
@@ -15,7 +15,7 @@
         "suites": [
             {
                 "name": "truffle",
-                "version": "6a91d68cc4b39bf059c5de38eb7df2a13b5bf93c",
+                "version": "47033f56665100fd5f7cbafd96d6c3112329f517",
                 "urls": [
                     {"url": "https://github.com/graalvm/truffle.git",
                         "kind": "git"},
@@ -50,6 +50,8 @@
             "dependencies": [
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_DEBUG",
+                "truffle:TRUFFLE_DSL_PROCESSOR",
+                "truffle:TRUFFLE_TCK",
             ],
         },
         "jruby-lib-jni": {
@@ -59,6 +61,8 @@
             "dependencies": [
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_DEBUG",
+                "truffle:TRUFFLE_DSL_PROCESSOR",
+                "truffle:TRUFFLE_TCK",
             ],
         },
     },
@@ -85,6 +89,8 @@
                 "RUBY-ZIP",
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_DEBUG",
+ 		"truffle:TRUFFLE_DSL_PROCESSOR",
+                "truffle:TRUFFLE_TCK",
             ],
             "description": "JRuby+Truffle",
             "license": "EPL"
@@ -100,6 +106,8 @@
             "distDependencies": [
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_DEBUG",
+		"truffle:TRUFFLE_DSL_PROCESSOR",
+                "truffle:TRUFFLE_TCK",
             ],
             "description": "JRuby+Truffle Native Libs",
             "license": "EPL"

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -40,16 +40,30 @@ def self.truffle_version
       end
     end
   end
-
+
+  def self.truffle_release?
+    !truffle_version.include?('SNAPSHOT')
+  end
+
   def self.find_graal_javacmd_and_options
-    graalvm_bin_var = ENV['GRAALVM_BIN'] || ENV["GRAALVM_BIN_#{mangle_for_env(git_branch)}"]
-    graal_home_var = ENV['GRAAL_HOME'] || ENV["GRAAL_HOME_#{mangle_for_env(git_branch)}"]
-
-    if graalvm_bin_var
-      javacmd = File.expand_path(graalvm_bin_var)
+    graalvm = ENV['GRAALVM_BIN']
+    graal_home = ENV['GRAAL_HOME']
+
+    raise "Both GRAALVM_BIN and GRAAL_HOME defined!" if graalvm && graal_home
+
+    if !graalvm && !graal_home
+      if truffle_release?
+        graalvm = ENV['GRAALVM_RELEASE_BIN']
+      else
+        graal_home = ENV['GRAAL_HOME_TRUFFLE_HEAD']
+      end
+    end
+
+    if graalvm
+      javacmd = File.expand_path(graalvm)
       options = []
-    elsif graal_home_var
-      graal_home = File.expand_path(graal_home_var)
+    elsif graal_home
+      graal_home = File.expand_path(graal_home)
       if ENV['JVMCI_JAVA_HOME']
         mx_options = "--java-home #{ENV['JVMCI_JAVA_HOME']}"
       else
@@ -167,10 +181,6 @@ def self.git_branch
     @git_branch ||= `GIT_DIR="#{JRUBY_DIR}/.git" git rev-parse --abbrev-ref HEAD`.strip
   end
 
-  def self.mangle_for_env(name)
-    name.upcase.tr('-', '_')
-  end
-
   def self.igv_running?
     `ps ax`.include?('idealgraphvisualizer')
   end
@@ -390,11 +400,11 @@ def help
     puts
     puts '  RUBY_BIN                                     The JRuby+Truffle executable to use (normally just bin/jruby)'
     puts '  GRAALVM_BIN                                  GraalVM executable (java command) to use'
-    puts '  GRAALVM_BIN_...git_branch_name...            GraalVM executable to use for a given branch'
-    puts '           branch names are mangled - eg truffle-head becomes GRAALVM_BIN_TRUFFLE_HEAD'
-    puts '  GRAAL_HOME                                   Directory where there is a built checkout of the Graal compiler (make sure mx is on your path and maybe set JVMCI_JAVA_HOME)'
-    puts '  GRAAL_HOME_...git_branch_name...'
+    puts '  GRAAL_HOME                                   Directory where there is a built checkout of the Graal compiler'
+    puts '                                               (make sure mx is on your path and maybe set JVMCI_JAVA_HOME)'
     puts '  JVMCI_JAVA_HOME                              The Java with JVMCI to use with GRAAL_HOME'
+    puts '  GRAALVM_RELEASE_BIN                          Default GraalVM executable when using a released version of Truffle (such as on master)'
+    puts '  GRAAL_HOME_TRUFFLE_HEAD                      Default Graal directory when using a snapshot version of Truffle (such as on truffle-head)'
     puts '  GRAAL_JS_JAR                                 The location of trufflejs.jar'
     puts '  SL_JAR                                       The location of truffle-sl.jar'
     puts '  SULONG_DIR                                   The location of a built checkout of the Sulong repository'
@@ -755,7 +765,8 @@ def test_specs(command, *args)
   private :test_specs
 
   def test_tck(*args)
-    mvn *args + ['-Ptck']
+    env = {'JRUBY_BUILD_MORE_QUIET' => 'true'}
+    mvn env, *args + ['-Ptck']
   end
   private :test_tck
 

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -9,7 +9,7 @@
 
   properties( 'polyglot.dump.pom' => 'pom.xml',
               'polyglot.dump.readonly' => true,
-              'truffle.version' => '6a91d68cc4b39bf059c5de38eb7df2a13b5bf93c-SNAPSHOT',
+              'truffle.version' => 'b549cb8d916cd87470564d40ecb9805547c28b5e-SNAPSHOT',
               'jruby.basedir' => '${basedir}/..',
               'maven.test.skip' => 'true' )
 

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
     <jruby.basedir>${basedir}/..</jruby.basedir>
     <polyglot.dump.readonly>true</polyglot.dump.readonly>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
-    <truffle.version>6a91d68cc4b39bf059c5de38eb7df2a13b5bf93c-SNAPSHOT</truffle.version>
+    <truffle.version>b549cb8d916cd87470564d40ecb9805547c28b5e-SNAPSHOT</truffle.version>
   </properties>
   <dependencies>
     <dependency>

diff --git a/truffle/src/main/java/org/jruby/truffle/language/RubyRootNode.java b/truffle/src/main/java/org/jruby/truffle/language/RubyRootNode.java
@@ -71,6 +71,11 @@ public Node copy() {
         return cloned;
     }
 
+    @Override
+    public String getName() {
+        return sharedMethodInfo.getName();
+    }
+
     @Override
     public String toString() {
         return sharedMethodInfo.toString();

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java
@@ -63,6 +63,8 @@ public Object execute(VirtualFrame frame) {
         } catch (StackOverflowError error) {
             errorProfile.enter();
             throw new RaiseException(translate(error));
+        } catch (ThreadDeath death) {
+            throw death;
         } catch (Throwable exception) {
             errorProfile.enter();
             throw new RaiseException(translate(exception));

diff --git a/truffle/src/main/ruby/core/hash.rb b/truffle/src/main/ruby/core/hash.rb
@@ -37,11 +37,7 @@ class Hash
 
   def self.contains_all_internal(one, two)
     one.all? do |key, value|
-      begin
-        value === two.fetch(key)
-      rescue KeyError
-        false
-      end
+      two.has_key?(key) && (value.equal?(two[key]) || value == two[key])
     end
   end
 

diff --git a/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java b/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java
@@ -38,6 +38,13 @@ protected synchronized PolyglotEngine prepareVM() throws Exception {
         return engine;
     }
 
+    @Override
+    protected PolyglotEngine prepareVM(PolyglotEngine.Builder preparedBuilder) throws Exception {
+        final PolyglotEngine engine = preparedBuilder.build();
+        engine.eval(Source.fromFileName("src/test/ruby/tck.rb"));
+        return engine;
+    }
+
     @Override
     protected String mimeType() {
         return RubyLanguage.MIME_TYPE;
@@ -128,6 +135,11 @@ protected String addToArray() {
         return "add_array";
     }
 
+    @Override
+    protected String countUpWhile() {
+        return "count_up_while";
+    }
+
     @Override
     public void testCoExistanceOfMultipleLanguageInstances() throws Exception {
         /*

diff --git a/truffle/src/test/ruby/tck.rb b/truffle/src/test/ruby/tck.rb
@@ -155,3 +155,13 @@ def add_array(array, index, value)
 end
 
 Truffle::Interop.export_method(:add_array)
+
+def count_up_while(f)
+  counter = 0
+  loop do
+    break unless f.call(counter)
+    counter += 1
+  end
+end
+
+Truffle::Interop.export_method(:count_up_while)