Attempt to remove WrapperMethod again.

jruby · Jan 25, 2018 · c827260 · c827260
1 parent 82fe95d
commit c827260
Showing 4 changed files with 9 additions and 123 deletions.
diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -37,7 +37,6 @@
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.IRMethodArgs;
 import org.jruby.internal.runtime.methods.ProcMethod;
-import org.jruby.internal.runtime.methods.WrapperMethod;
 import org.jruby.runtime.ArgumentDescriptor;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ClassIndex;
@@ -252,7 +251,7 @@ public IRubyObject inspect() {
         RubyModule definedClass;
         RubyModule mklass = originModule;
 
-        if (method instanceof AliasMethod || method instanceof WrapperMethod) {
+        if (method instanceof AliasMethod) {
             definedClass = method.getRealMethod().getDefinedClass();
         }
         else {

diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -79,7 +79,6 @@
 import org.jruby.internal.runtime.methods.ProcMethod;
 import org.jruby.internal.runtime.methods.SynchronizedDynamicMethod;
 import org.jruby.internal.runtime.methods.UndefinedMethod;
-import org.jruby.internal.runtime.methods.WrapperMethod;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRMethod;
 import org.jruby.ir.runtime.IRRuntimeHelpers;
@@ -1838,7 +1837,7 @@ public void exportMethod(String name, Visibility visibility) {
             if (this == method.getImplementationClass()) {
                 method.setVisibility(visibility);
             } else {
-                DynamicMethod newMethod = new WrapperMethod(this, method, visibility);
+                DynamicMethod newMethod = new AliasMethod(this, visibility, method);
 
                 methodLocation.addMethod(name, newMethod);
             }

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/AliasMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/AliasMethod.java
@@ -34,6 +34,7 @@
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
@@ -49,6 +50,12 @@ public AliasMethod(RubyModule implementationClass, DynamicMethod oldMethod, Stri
         this.oldMethod = oldMethod;
     }
 
+    public AliasMethod(RubyModule implementationClass, Visibility visiblity, DynamicMethod oldMethod) {
+        super(implementationClass, visiblity, oldMethod.getName());
+
+        this.oldMethod = oldMethod;
+    }
+
     @Override
     public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule klazz, String name) {
         return oldMethod.call(context, self, klazz, name);

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/WrapperMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/WrapperMethod.java