Fixes #4586. JRuby profiler raises exception when using the holidays gem

jruby · May 11, 2017 · 7f6e378 · 7f6e378
1 parent c7dfb2d
commit 7f6e378
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/ProfilingDynamicMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/ProfilingDynamicMethod.java
@@ -29,14 +29,17 @@
 package org.jruby.internal.runtime.methods;
 
 import org.jruby.RubyModule;
+import org.jruby.runtime.ArgumentDescriptor;
 import org.jruby.runtime.Block;
+import org.jruby.runtime.Helpers;
+import org.jruby.runtime.Signature;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
  * A DynamicMethod wrapper that performs timed profiling for each call.
  */
-public class ProfilingDynamicMethod extends DelegatingDynamicMethod {
+public class ProfilingDynamicMethod extends DelegatingDynamicMethod implements IRMethodArgs {
 
     public ProfilingDynamicMethod(DynamicMethod delegate) {
         super(delegate);
@@ -156,4 +159,14 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
     public DynamicMethod dup() {
         return new ProfilingDynamicMethod(delegate.dup());
     }
+
+    public Signature getSignature() {
+        return delegate instanceof IRMethodArgs ?
+                ((IRMethodArgs) delegate).getSignature() : Signature.from(delegate.getArity());
+    }
+
+    public ArgumentDescriptor[] getArgumentDescriptors() {
+        return delegate instanceof IRMethodArgs ?
+                ((IRMethodArgs) delegate).getArgumentDescriptors() : Helpers.methodToArgumentDescriptors(delegate);
+    }
 }