Fill out port of check_funcall logic more completely.

This may fix #1976.
jruby · Sep 16, 2014 · 769b2c3 · 769b2c3
1 parent 44f83a9
commit 769b2c3
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/RubyClass.java b/core/src/main/java/org/jruby/RubyClass.java
@@ -622,7 +622,7 @@ public IRubyObject finvokeChecked(ThreadContext context, IRubyObject self, Strin
             return null;
 
         me = searchMethod(name);
-        if (!checkFuncallCallable(context, me)) {
+        if (!checkFuncallCallable(context, me, CallType.FUNCTIONAL, self)) {
             return checkFuncallMissing(context, klass, self, name);
         }
         return me.call(context, self, klass, name);
@@ -665,9 +665,14 @@ private static boolean checkFuncallRespondTo(ThreadContext context, RubyClass kl
     }
 
     // MRI: check_funcall_callable
-    public static boolean checkFuncallCallable(ThreadContext context, DynamicMethod method) {
-        // FIXME: MRI actually checks protectedness here too
-        return !method.getVisibility().isPrivate();
+    public static boolean checkFuncallCallable(ThreadContext context, DynamicMethod method, CallType callType, IRubyObject self) {
+        return rbMethodCallStatus(context, method, callType, self);
+    }
+
+    // MRI: rb_method_call_status
+    // FIXME: Partial impl because we don't have these "NOEX" flags
+    public static boolean rbMethodCallStatus(ThreadContext context, DynamicMethod method, CallType callType, IRubyObject self) {
+        return !method.isUndefined() && method.isCallableFrom(self, callType);
     }
 
     private static IRubyObject checkFuncallMissing(ThreadContext context, RubyClass klass, IRubyObject self, String method, IRubyObject... args) {