[Truffle] Correct Exception#message.

jruby · Aug 28, 2015 · 2b6b870 · 2b6b870
1 parent e94c408
commit 2b6b870
Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
@@ -139,7 +139,12 @@ public MessageNode(RubyContext context, SourceSection sourceSection) {
         @Specialization
         public Object message(DynamicObject exception) {
             final Object message = Layouts.EXCEPTION.getMessage(exception);
-            return message == null ? nil() : message;
+            if (message == null) {
+                final String className = Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(exception)).getName();
+                return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist(className, UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
+            } else {
+                return message;
+            }
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -21,6 +21,7 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.ConditionProfile;
+
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.RubyString;
@@ -1857,11 +1858,11 @@ public ToSNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
         public DynamicObject toS(DynamicObject module) {
-            CompilerDirectives.transferToInterpreter();
-
-            return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist(Layouts.MODULE.getFields(module).getName(), UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
+            final String name = Layouts.MODULE.getFields(module).getName();
+            return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist(name, UTF8Encoding.INSTANCE), StringSupport.CR_UNKNOWN, null);
         }
 
     }