[refactor] avoid setCallInfo usage in JRubyMethod

Author: kares

core/src/main/java/org/jruby/RubyData.java

@@ -239,7 +239,7 @@ public static RubyHash deconstruct_keys(ThreadContext context, IRubyObject self,
     @JRubyMethod(keywords = true, optional = 1, checkArity = false)
     public static IRubyObject with(ThreadContext context, IRubyObject self, IRubyObject[] args) {
         IRubyObject kwargs = IRRuntimeHelpers.receiveKeywords(context, args, false, true, false);
-        if (kwargs == UndefinedValue.UNDEFINED || kwargs.isNil()) {
+        if (!(kwargs instanceof RubyHash)) {
             checkArgumentCount(context, args.length, 0, 0);
             return self;
         }
@@ -249,7 +249,7 @@ public static IRubyObject with(ThreadContext context, IRubyObject self, IRubyObj
         RubyHash kwargsHash = (RubyHash) kwargs;
         RubyHash h = to_h(context, self, Block.NULL_BLOCK);
         h.addAll(context, kwargsHash);
-        setCallInfo(context, CALL_KEYWORD);
+        context.callInfo = CALL_KEYWORD;
         return DataMethods.rbNew(context, self.getMetaClass(), h);
     }
 
@@ -277,7 +277,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
             IRubyObject dataObject = klass.getAllocator().allocate(context.runtime, klass);
 
-            setCallInfo(context, ThreadContext.CALL_KEYWORD);
+            context.callInfo = ThreadContext.CALL_KEYWORD;
 
             // TODO: avoid initialize and hash overhead for known types
             dataObject.getMetaClass().getBaseCallSite(RubyClass.CS_IDX_INITIALIZE)
@@ -326,7 +326,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
             IRubyObject dataObject = klass.getAllocator().allocate(context.runtime, klass);
 
-            setCallInfo(context, callInfo);
+            context.callInfo = callInfo;
 
             // TODO: avoid initialize and hash overhead for known types
             dataObject.getMetaClass().getBaseCallSite(RubyClass.CS_IDX_INITIALIZE)

core/src/main/java/org/jruby/RubyFile.java

@@ -299,7 +299,7 @@ public IRubyObject flock(ThreadContext context, IRubyObject operation) {
     @JRubyMethod(name = "initialize", required = 1, optional = 3, checkArity = false, visibility = PRIVATE, keywords = true)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
         // capture callInfo for delegating to IO#initialize
-        int callInfo = context.callInfo;
+        final int callInfo = context.callInfo;
         IRubyObject keywords = IRRuntimeHelpers.receiveKeywords(context, args, false, true, false);
         // Mild hack. We want to arity-mismatch if extra arg is not really a kwarg but not if it is one.
         int maxArgs = keywords instanceof RubyHash ? 4 : 3;
@@ -311,7 +311,7 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block b
             IRubyObject fd = TypeConverter.convertToTypeWithCheck(context, args[0], context.runtime.getFixnum(), sites(context).to_int_checked);
             if (!fd.isNil()) {
                 // restore callInfo for delegated call to IO#initialize
-                IRRuntimeHelpers.setCallInfo(context, callInfo);
+                context.callInfo = callInfo;
                 return switch (argc) {
                     case 1 -> super.initialize(context, fd, block);
                     case 2 -> super.initialize(context, fd, args[1], block);