jruby · Jun 15, 2015 · Jun 15, 2015 · Jun 15, 2015 · Jun 16, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ModulePrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ModulePrimitiveNodes.java
@@ -9,35 +9,49 @@
  */
 package org.jruby.truffle.nodes.rubinius;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.runtime.RubyConstant;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyBasicObject;
+import org.jruby.truffle.runtime.core.RubyClass;
 import org.jruby.truffle.runtime.core.RubyModule;
-import org.jruby.truffle.runtime.core.RubyString;
+
 
 public abstract class ModulePrimitiveNodes {
 
     @RubiniusPrimitive(name = "module_mirror")
     public abstract static class ModuleMirrorPrimitiveNode extends RubiniusPrimitiveNode {
 
-        @CompilationFinal RubyModule stringMirror;
-
         public ModuleMirrorPrimitiveNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @Specialization(guards = "logicalClass == object.getLogicalClass()")
+        public Object moduleMirrorCached(RubyBasicObject object,
+                                             @Cached("object.getLogicalClass()") RubyClass logicalClass,
+                                             @Cached("lookupMirror(object)") Object mirror) {
+            return mirror;
+        }
+
         @Specialization
-        public RubyModule moduleMirror(RubyString string) {
-            if (stringMirror == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                final RubyModule rubinius = (RubyModule) getContext().getCoreLibrary().getObjectClass().getConstants().get("Rubinius").getValue();
-                final RubyModule mirror = (RubyModule) rubinius.getConstants().get("Mirror").getValue();
-                stringMirror = (RubyModule) mirror.getConstants().get("String").getValue();
+        public Object moduleMirrorUncached(RubyBasicObject object) {
+            return lookupMirror(object);
+        }
+
+        @TruffleBoundary
+        protected Object lookupMirror(RubyBasicObject object) {
+            final RubyModule rubinius = (RubyModule) getContext().getCoreLibrary().getObjectClass().getConstants().get("Rubinius").getValue();
+            final RubyModule mirror = (RubyModule) rubinius.getConstants().get("Mirror").getValue();
+            final RubyConstant objectMirrorConstant = mirror.getConstants().get(object.getLogicalClass().getName());
+
+            if (objectMirrorConstant == null) {
+                return nil();
             }
-            
-            return stringMirror;
+
+            return objectMirrorConstant.getValue();
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -220,9 +220,6 @@ public CoreLibrary(RubyContext context) {
         // Exception
         exceptionClass = defineClass("Exception", new RubyException.ExceptionAllocator());
 
-        // FiberError
-        fiberErrorClass = defineClass(exceptionClass, "FiberError");
-
         // NoMemoryError
         defineClass(exceptionClass, "NoMemoryError");
 
@@ -233,6 +230,7 @@ public CoreLibrary(RubyContext context) {
         standardErrorClass = defineClass(exceptionClass, "StandardError");
         argumentErrorClass = defineClass(standardErrorClass, "ArgumentError");
         encodingErrorClass = defineClass(standardErrorClass, "EncodingError");
+        fiberErrorClass = defineClass(standardErrorClass, "FiberError");
         ioErrorClass = defineClass(standardErrorClass, "IOError");
         localJumpErrorClass = defineClass(standardErrorClass, "LocalJumpError");
         regexpErrorClass = defineClass(standardErrorClass, "RegexpError");

diff --git a/truffle/src/main/ruby/core/rubinius/README.md b/truffle/src/main/ruby/core/rubinius/README.md
@@ -1,6 +1,6 @@
 `bootstrap`, `common`, `delta` and `platform` contains the Ruby component of the
 Rubinius kernel (core library) implementation, in some cases modified. We have
-taken files from version 2.4.1 of Rubinius. This code was written by Evan
+taken files from version 2.5.6 of Rubinius. This code was written by Evan
 Phoenix, Brian Shirai, et al.
 
 https://github.com/rubinius/rubinius

diff --git a/truffle/src/main/ruby/core/rubinius/api/shims/rubinius.rb b/truffle/src/main/ruby/core/rubinius/api/shims/rubinius.rb
@@ -47,5 +47,5 @@ class DynamicLibrary
 
 end
 
-class PrimitiveFailure < StandardError
+class PrimitiveFailure < Exception
 end
diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/basic_object.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/basic_object.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/channel.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/channel.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/character.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/character.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/configuration.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/configuration.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/dir.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/dir.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/false.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/false.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/gc.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/gc.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/io.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/io.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015 Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -163,7 +163,7 @@ def close
   #
   def shutdown(how)
     Rubinius.primitive :io_shutdown
-    raise PrimitiveFailure, "IO#innertShutdown primitive failed"
+    raise PrimitiveFailure, "IO#shutdown primitive failed"
   end
 
   def socket_recv(bytes, flags, type)

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/kernel.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/kernel.rb
@@ -1,12 +1,4 @@
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
-# code is released under a tri EPL/GPL/LGPL license. You can use it,
-# redistribute it and/or modify it under the terms of the:
-#
-# Eclipse Public License version 1.0
-# GNU General Public License version 2
-# GNU Lesser General Public License version 2.1
-
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015 Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/mirror.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/mirror.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@ def initialize(obj)
     end
 
     class Object < Mirror
-      subject = ::Object
+      self.subject = ::Object
     end
 
     def inspect

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/nil.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/nil.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/process.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/process.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/regexp.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/regexp.rb
@@ -1,12 +1,4 @@
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
-# code is released under a tri EPL/GPL/LGPL license. You can use it,
-# redistribute it and/or modify it under the terms of the:
-#
-# Eclipse Public License version 1.0
-# GNU General Public License version 2
-# GNU Lesser General Public License version 2.1
-
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015 Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/rubinius.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/rubinius.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/stat.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/stat.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/string.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/string.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/symbol.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/symbol.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/thread.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/thread.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/time.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/time.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/true.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/true.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/type.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/type.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
-Original file line number
+Diff line change
@@ @@ -47,5 +47,5 @@ class DynamicLibrary @@
     end
-    class PrimitiveFailure < StandardError
+    class PrimitiveFailure < Exception
     end