From 3579f2e0aa366d43e5e0d315a846e03c2ceb3c94 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Tue, 2 Jun 2015 13:20:18 -0500 Subject: [PATCH] This condition does not seem necessary anymore. Fixes #3008. I believe this condition was added by @tdeuhr before he adjusted the lookup logic to work like MRI. Without it, all tests and specs appear to pass as before, and the error from #3008 goes away. --- core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java index 81350303c40..3762059099d 100644 --- a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java +++ b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java @@ -922,7 +922,7 @@ public static IRubyObject unresolvedSuper(ThreadContext context, IRubyObject sel DynamicMethod method = superClass != null ? superClass.searchMethod(methodName) : UndefinedMethod.INSTANCE; IRubyObject rVal = null; - if (method.isUndefined()|| (superClass.isPrepended() && (method.isImplementedBy(self.getType())))) { + if (method.isUndefined()) { rVal = Helpers.callMethodMissing(context, self, method.getVisibility(), methodName, CallType.SUPER, args, block); } else { rVal = method.call(context, self, superClass, methodName, args, block);