[fix] proper call-info reset/restoration

Author: kares

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

@@ -388,8 +388,7 @@ public static IRubyObject external_encoding(ThreadContext context, IRubyObject r
     }
 
     // MRI: argf_getline
-    private static IRubyObject argf_getline(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        final int callInfo = ThreadContext.resetCallInfo(context);
+    private static IRubyObject argf_getline(ThreadContext context, final int callInfo, IRubyObject[] args) {
         IRubyObject line;
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
 
@@ -399,8 +398,10 @@ private static IRubyObject argf_getline(ThreadContext context, IRubyObject recv,
             RubyIO currentFile = (RubyIO) data.currentFile;
 
             if (isGenericInput(context, data)) {
+                final int prevCallInfo = context.callInfo;
                 context.callInfo = callInfo; // restore callInfo for kwargs
                 line = data.currentFile.callMethod(context, "gets", args);
+                context.callInfo = prevCallInfo;
             } else {
                 if (args.length == 0 && context.runtime.getRecordSeparatorVar().get() == globalVariables(context).getDefaultSeparator()) {
                     line = (currentFile).gets(context);
@@ -433,9 +434,10 @@ private static boolean isGenericInput(ThreadContext context, ArgsFileData data)
      */
     @JRubyMethod(name = "gets", optional = 1, keywords = true, checkArity = false, writes = LASTLINE)
     public static IRubyObject gets(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        final int callInfo = ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 0, 1);
 
-        return context.setLastLine(argf_getline(context, recv, args));
+        return context.setLastLine(argf_getline(context, callInfo, args));
     }
 
     /** Read a line.
@@ -452,36 +454,26 @@ public static IRubyObject readline(ThreadContext context, IRubyObject recv, IRub
 
     @JRubyMethod(optional = 1, keywords = true, checkArity = false)
     public static IRubyObject readlines(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        final int callInfo = ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 0, 1);
 
-        int callInfo = context.callInfo;
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
 
         if (!data.next_argv(context)) return newEmptyArray(context);
 
-        if (!(data.currentFile instanceof RubyIO)) return data.currentFile.callMethod(context, "readlines", args);
+        if (!(data.currentFile instanceof RubyIO)) {
+            // TODO do we need to restore callInfo here?
+            return data.currentFile.callMethod(context, "readlines", args);
+        }
 
         var ary = newArray(context);
         IRubyObject line;
-        while(!(line = argfGetlineLoopWithKeywords(context, recv, args, callInfo)).isNil()) {
+        while(!(line = argf_getline(context, callInfo, args)).isNil()) {
             ary.append(context, line);
         }
         return ary;
     }
 
-    /**
-     * Call argf_getline as in a loop, providing the given keywords state between calls.
-     *
-     * @param context
-     * @param recv
-     * @param args
-     * @return
-     */
-    private static IRubyObject argfGetlineLoopWithKeywords(ThreadContext context, IRubyObject recv, IRubyObject[] args, int callInfo) {
-        context.callInfo = callInfo;
-        return argf_getline(context, recv, args);
-    }
-
     @JRubyMethod(optional = 1, checkArity = false)
     public static IRubyObject to_a(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         Arity.checkArgumentCount(context, args, 0, 1);
@@ -493,7 +485,7 @@ public static IRubyObject to_a(ThreadContext context, IRubyObject recv, IRubyObj
 
         var ary = newArray(context);
         IRubyObject line;
-        while ((line = argf_getline(context, recv, args)) != context.nil) {
+        while ((line = argf_getline(context, 0, args)) != context.nil) {
             ary.append(context, line);
         }
         return ary;
@@ -598,9 +590,9 @@ public static IRubyObject codepoints(ThreadContext context, IRubyObject recv, Bl
     public static IRubyObject each_line(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
         if (!block.isGiven()) return enumeratorize(context.runtime, recv, "each_line", args);
 
+        final int callInfo = ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 0, 1);
 
-        int callInfo = context.callInfo;
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
 
         if (!data.next_argv(context)) return context.nil;
@@ -613,7 +605,7 @@ public static IRubyObject each_line(ThreadContext context, IRubyObject recv, IRu
         }
 
         IRubyObject str;
-        while ((str = argfGetlineLoopWithKeywords(context, recv, args, callInfo)) != context.nil) {
+        while ((str = argf_getline(context, callInfo, args)) != context.nil) {
         	block.yield(context, str);
         }