jruby · Feb 27, 2015 · Feb 27, 2015 · Feb 27, 2015 · Feb 27, 2015 · Feb 27, 2015
diff --git a/COPYING b/COPYING
@@ -114,6 +114,9 @@ lib/ruby/1.9, and lib/ruby/site_ruby/1.8/rubygems*.
  copyright (c) 2007-2014, Evan Phoenix and contributors,
  and released under the 3-clause BSD license.
 
+ Some parts of the RubySL implementations of the stdlib in lib/ruby/truffle/rubysl
+ are copyright (c) 2013 Brian Shirai and are licensed under the 3-clause BSD license.
+
 The complete text of the Eclipse Public License is as follows:
 
   Eclipse Public License - v 1.0

diff --git a/core/pom.rb b/core/pom.rb
@@ -41,12 +41,12 @@
   jar 'org.ow2.asm:asm-util:${asm.version}'
 
   jar 'com.github.jnr:jnr-netdb:1.1.4'
-  jar 'com.github.jnr:jnr-enxio:0.6'
+  jar 'com.github.jnr:jnr-enxio:0.7'
   jar 'com.github.jnr:jnr-x86asm:1.0.2'
-  jar 'com.github.jnr:jnr-unixsocket:0.5'
-  jar 'com.github.jnr:jnr-posix:3.0.9'
+  jar 'com.github.jnr:jnr-unixsocket:0.6'
+  jar 'com.github.jnr:jnr-posix:3.0.10'
   jar 'com.github.jnr:jnr-constants:0.8.6'
-  jar 'com.github.jnr:jnr-ffi:2.0.1'
+  jar 'com.github.jnr:jnr-ffi:2.0.2'
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-enxio</artifactId>
-      <version>0.6</version>
+      <version>0.7</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -101,12 +101,12 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
-      <version>0.5</version>
+      <version>0.6</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.9</version>
+      <version>3.0.10</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -116,7 +116,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-ffi</artifactId>
-      <version>2.0.1</version>
+      <version>2.0.2</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

diff --git a/core/src/main/java/org/jruby/RubyException.java b/core/src/main/java/org/jruby/RubyException.java
@@ -386,6 +386,10 @@ public IRubyObject to_s19(ThreadContext context) {
         return message.asString();
     }
 
+    public IRubyObject getMessage() {
+        return message;
+    }
+
     private BacktraceData backtraceData;
     private IRubyObject backtrace;
     public IRubyObject message;

diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -452,24 +452,25 @@ public String getBaseName() {
      */
     public void setBaseName(String name) {
         baseName = name;
+        cachedName = null;
     }
 
     /**
      * Generate a fully-qualified class name or a #-style name for anonymous and singleton classes.
-     * 
+     *
      * Ruby C equivalent = "classname"
-     * 
+     *
      * @return The generated class name
      */
     public String getName() {
         if (cachedName != null) return cachedName;
         return calculateName();
     }
-    
+
     /**
      * Get the "simple" name for the class, which is either the "base" name or
      * the "anonymous" class name.
-     * 
+     *
      * @return the "simple" name of the class
      */
     public String getSimpleName() {

diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -183,21 +183,23 @@ public static IRubyObject initiateBreak(ThreadContext context, DynamicScope dynS
         }
     }
 
-    @JIT
+    @Interp @JIT
     public static IRubyObject handleBreakAndReturnsInLambdas(ThreadContext context, StaticScope scope, DynamicScope dynScope, Object exc, Block.Type blockType) throws RuntimeException {
         if ((exc instanceof IRBreakJump) && inNonMethodBodyLambda(scope, blockType)) {
             // We just unwound all the way up because of a non-local break
-            throw IRException.BREAK_LocalJumpError.getException(context.getRuntime());
-        } else if (exc instanceof IRReturnJump && (blockType == null || inLambda(blockType))) {
+            if (((IRBreakJump)exc).scopeToReturnTo == dynScope) throw IRException.BREAK_LocalJumpError.getException(context.getRuntime());
+        }
+
+        if (exc instanceof IRReturnJump && (blockType == null || inLambda(blockType))) {
             // Ignore non-local return processing in non-lambda blocks.
             // Methods have a null blocktype
             return handleNonlocalReturn(scope, dynScope, exc, blockType);
-        } else {
-            // Propagate
-            Helpers.throwException((Throwable)exc);
-            // should not get here
-            return null;
         }
+
+        // Propagate
+        Helpers.throwException((Throwable)exc);
+        // should not get here
+        return null;
     }
 
     @JIT

diff --git a/core/src/main/java/org/jruby/java/invokers/InstanceMethodInvoker.java b/core/src/main/java/org/jruby/java/invokers/InstanceMethodInvoker.java
@@ -3,7 +3,6 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.jruby.Ruby;
 import org.jruby.RubyModule;
 import org.jruby.RubyProc;
 import org.jruby.java.proxies.JavaProxy;
@@ -26,7 +25,7 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
         JavaProxy proxy = castJavaProxy(self);
 
         int len = args.length;
-        Object[] convertedArgs = new Object[len];
+        final Object[] convertedArgs;
         JavaMethod method = (JavaMethod)findCallable(self, name, args, len);
         if (method.isVarArgs()) {
             len = method.getParameterTypes().length - 1;
@@ -82,6 +81,7 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
         return method.invokeDirect(context, proxy.getObject(), cArg0, cArg1, cArg2);
     }
 
+    @Override
     public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
         if (block.isGiven()) {
             JavaProxy proxy = castJavaProxy(self);

diff --git a/core/src/main/java/org/jruby/java/invokers/MethodInvoker.java b/core/src/main/java/org/jruby/java/invokers/MethodInvoker.java
@@ -9,33 +9,34 @@
 import org.jruby.javasupport.JavaMethod;
 
 public abstract class MethodInvoker extends RubyToJavaInvoker {
+
     MethodInvoker(RubyModule host, List<Method> methods) {
         super(host, methods.toArray(new Method[methods.size()]));
         trySetAccessible(getAccessibleObjects());
     }
 
     MethodInvoker(RubyModule host, Method method) {
-        super(host, new Method[] {method});
+        super(host, new Method[] { method });
         trySetAccessible(getAccessibleObjects());
     }
 
     @Override
-    protected JavaCallable createCallable(Ruby ruby, Member member) {
-        return JavaMethod.create(ruby, (Method)member);
+    protected final JavaCallable createCallable(Ruby runtime, Member member) {
+        return JavaMethod.create(runtime, (Method) member);
     }
 
     @Override
-    protected JavaCallable[] createCallableArray(JavaCallable callable) {
-        return new JavaMethod[] {(JavaMethod)callable};
+    protected final JavaCallable[] createCallableArray(JavaCallable callable) {
+        return new JavaMethod[] { (JavaMethod) callable };
     }
 
     @Override
-    protected JavaCallable[] createCallableArray(int size) {
+    protected final JavaCallable[] createCallableArray(int size) {
         return new JavaMethod[size];
     }
 
     @Override
-    protected JavaCallable[][] createCallableArrayArray(int size) {
+    protected final JavaCallable[][] createCallableArrayArray(int size) {
         return new JavaMethod[size][];
     }