[Truffle] fix NoMethodError message on receiver

jruby · Mar 29, 2016 · ad44636 · eregon · Mar 30, 2016 · pitr-ch
1 parent 482198f
commit ad44636
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -1258,12 +1258,13 @@ public DynamicObject noSuperMethodError(String name, Node currentNode) {
 
     public DynamicObject noMethodErrorOnReceiver(String name, Object receiver, Node currentNode) {
         CompilerAsserts.neverPartOfCompilation();
-        DynamicObject logicalClass = getLogicalClass(receiver);
-        String repr = Layouts.MODULE.getFields(logicalClass).getName();
-        if (RubyGuards.isRubyModule(receiver)) {
-            repr = Layouts.MODULE.getFields(((DynamicObject) receiver)).getName() + ":" + repr;
-        }
-        return noMethodError(String.format("undefined method `%s' for %s", name, repr), name, currentNode);
+        final DynamicObject logicalClass = getLogicalClass(receiver);
+        final String moduleName = Layouts.MODULE.getFields(logicalClass).getName();
+
+        // Do not call to_s on BasicObject
+        final Object to_s = getContext().getCodeLoader().inline(currentNode, "o.to_s if c.instance_methods.include?(:to_s)", "o", receiver, "c", logicalClass);
+
+        return noMethodError(String.format("undefined method `%s' for %s:%s", name, to_s, moduleName), name, currentNode);
     }
 
     public DynamicObject privateMethodError(String name, Object self, Node currentNode) {