[Truffle] Use the original method name for super.

* Fix name in SharedMethodInfo of define_method's methods.
jruby · Mar 9, 2015 · 2063892 · 2063892
1 parent 9d31d67
commit 2063892
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/spec/truffle/tags/language/super_tags.txt b/spec/truffle/tags/language/super_tags.txt
@@ -2,4 +2,3 @@ fails:The super keyword passes along modified rest args when they weren't origin
 fails:The super keyword passes along modified rest args when they were originally empty
 fails:The super keyword raises a RuntimeError when called with implicit arguments from a method defined with define_method
 fails:The super keyword calls method_missing when a superclass method is not found
-fails:The super keyword sees the included version of a module a method is alias from
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
@@ -973,7 +973,8 @@ private RubySymbol defineMethod(RubyModule module, String name, RubyProc proc) {
             notDesignedForCompilation();
 
             final CallTarget modifiedCallTarget = proc.getCallTargetForMethods();
-            final InternalMethod modifiedMethod = new InternalMethod(proc.getSharedMethodInfo(), name, module, Visibility.PUBLIC, false, modifiedCallTarget, proc.getDeclarationFrame());
+            final SharedMethodInfo info = proc.getSharedMethodInfo().withName(name);
+            final InternalMethod modifiedMethod = new InternalMethod(info, name, module, Visibility.PUBLIC, false, modifiedCallTarget, proc.getDeclarationFrame());
             module.addMethod(this, modifiedMethod);
 
             return getContext().getSymbolTable().getSymbol(name);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/supercall/AbstractGeneralSuperCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/supercall/AbstractGeneralSuperCallNode.java
@@ -67,7 +67,7 @@ private void lookup(VirtualFrame frame, boolean checkIfDefined) {
 
         currentMethod = RubyArguments.getMethod(frame.getArguments());
 
-        String name = currentMethod.getName();
+        String name = currentMethod.getSharedMethodInfo().getName(); // use the original name
         RubyModule declaringModule = currentMethod.getDeclaringModule();
 
         selfMetaClass = getContext().getCoreLibrary().getMetaClass(RubyArguments.getSelf(frame.getArguments()));

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java b/truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java
@@ -22,6 +22,7 @@ public class SharedMethodInfo {
     private final SourceSection sourceSection;
     private final LexicalScope lexicalScope;
     private final Arity arity;
+    /** The original name of the method. Does not change when aliased. */
     private final String name;
     private final boolean isBlock;
     private final org.jruby.ast.Node parseTree;
@@ -68,6 +69,10 @@ public boolean shouldAlwaysSplit() {
         return alwaysSplit;
     }
 
+    public SharedMethodInfo withName(String newName) {
+        return new SharedMethodInfo(sourceSection, lexicalScope, arity, newName, isBlock, parseTree, alwaysSplit);
+    }
+
     @Override
     public String toString() {
         final StringBuilder builder = new StringBuilder();