[GR-18163] Support refinements for Kernel#respond_to? (#2120)

PullRequest: truffleruby/2060

Author: eregon

CHANGELOG.md

@@ -48,6 +48,7 @@ Compatibility:
 * Avoid infinite recursion when redefining `Warning#warn` and calling `Kernel#warn` (#2109).
 * Convert objects with `#to_path` in `$LOAD_PATH` (#2119).
 * Handle the functions being native for `rb_thread_call_without_gvl()` (#2090).
+* Support refinements for Kernel#respond_to? (#2120, @ssnickolay)
 
 Performance:
 

lib/truffle/truffle/cext.rb

@@ -412,8 +412,12 @@ def rb_class_real(ruby_class)
     ruby_class
   end
 
-  def rb_obj_respond_to(object, id, priv)
-    Primitive.object_respond_to?(object, id, priv != 0)
+  def rb_obj_respond_to(object, name, priv)
+    object.respond_to?(name, priv != 0)
+  end
+
+  def rb_respond_to(object, name)
+    object.respond_to?(name, false)
   end
 
   def rb_check_convert_type(obj, type_name, method)
@@ -842,10 +846,6 @@ def rb_funcall_with_block(recv, meth, args, block)
     recv.public_send(meth, *args, &block)
   end
 
-  def rb_respond_to(object, name)
-    object.respond_to?(name)
-  end
-
   def rb_funcallv_public(recv, meth, args)
     recv.public_send(meth, *args)
   end

spec/tags/core/module/refine_tags.txt

@@ -1,2 +1 @@
-fails:Module#refine for methods accessed indirectly is honored by Kernel#respond_to?
 slow:Module#refine method lookup looks in the included modules for builtin methods

src/main/c/cext/range.c

@@ -15,8 +15,8 @@ VALUE rb_range_new(VALUE beg, VALUE end, int exclude_end) {
  */
 int rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp) {
   if (!rb_obj_is_kind_of(range, rb_cRange)) {
-    if (!RTEST(RUBY_INVOKE(range, "respond_to?", rb_intern("begin")))) return Qfalse;
-    if (!RTEST(RUBY_INVOKE(range, "respond_to?", rb_intern("end")))) return Qfalse;
+    if (!rb_respond_to(range, rb_intern("begin"))) return Qfalse;
+    if (!rb_respond_to(range, rb_intern("end"))) return Qfalse;
   }
 
   *begp = RUBY_INVOKE(range, "begin");

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -1559,6 +1559,7 @@ public abstract static class RespondToNode extends CoreMethodNode {
         @Child private InternalRespondToNode dispatch;
         @Child private InternalRespondToNode dispatchIgnoreVisibility;
         @Child private InternalRespondToNode dispatchRespondToMissing;
+        @Child private ReadCallerFrameNode readCallerFrame = ReadCallerFrameNode.create();
         @Child private DispatchNode respondToMissingNode;
         @Child private BooleanCastNode booleanCastNode;
         private final ConditionProfile ignoreVisibilityProfile = ConditionProfile.create();
@@ -1587,6 +1588,7 @@ protected boolean doesRespondToString(
                 boolean includeProtectedAndPrivate,
                 @Cached ToJavaStringNode toJavaString) {
             final boolean ret;
+            useCallerRefinements(frame);
 
             if (ignoreVisibilityProfile.profile(includeProtectedAndPrivate)) {
                 ret = dispatchIgnoreVisibility.execute(frame, object, toJavaString.executeToJavaString(name));
@@ -1616,6 +1618,7 @@ protected boolean doesRespondToSymbol(
                 boolean includeProtectedAndPrivate,
                 @Cached ToJavaStringNode toJavaString) {
             final boolean ret;
+            useCallerRefinements(frame);
 
             if (ignoreVisibilityProfile.profile(includeProtectedAndPrivate)) {
                 ret = dispatchIgnoreVisibility.execute(frame, object, toJavaString.executeToJavaString(name));
@@ -1648,6 +1651,13 @@ private boolean respondToMissing(VirtualFrame frame, Object object, RubySymbol n
             return booleanCastNode.executeToBoolean(
                     respondToMissingNode.call(object, "respond_to_missing?", name, includeProtectedAndPrivate));
         }
+
+        private void useCallerRefinements(VirtualFrame frame) {
+            if (frame != null) {
+                DeclarationContext context = RubyArguments.getDeclarationContext(readCallerFrame.execute(frame));
+                RubyArguments.setDeclarationContext(frame, context);
+            }
+        }
     }
 
     @CoreMethod(names = "respond_to_missing?", required = 2)

test/mri/excludes/TestRefinement.rb

@@ -3,7 +3,6 @@
 exclude :test_prepend_after_refine, "needs investigation"
 exclude :test_refine_prepended_class, "needs investigation"
 exclude :test_refine_with_proc, "needs investigation"
-exclude :test_respond_to_should_use_refinements, "needs investigation"
 exclude :test_tostring, "needs investigation"
 exclude :test_undef_original_method, "needs investigation"
 exclude :test_used_modules, "needs investigation"