pass runtime through

lopex · lopex · commit 1a52b2acb2f6 · 2018-08-01T00:40:14.000+02:00
diff --git a/core/src/main/java/org/jruby/RubyMatchData.java b/core/src/main/java/org/jruby/RubyMatchData.java
@@ -488,9 +488,9 @@ private static int nameToBackrefNumber(Ruby runtime, Regex pattern, Region regs,
         }
     }
 
-    public final int backrefNumber(IRubyObject obj) {
+    public final int backrefNumber(Ruby runtime, IRubyObject obj) {
         check();
-        return backrefNumber(getRuntime(), getPattern(), regs, obj);
+        return backrefNumber(runtime, getPattern(), regs, obj);
     }
 
     public static int backrefNumber(Ruby runtime, Regex pattern, Region regs, IRubyObject obj) {
@@ -630,11 +630,10 @@ public IRubyObject size(ThreadContext context) {
      */
     @JRubyMethod
     public IRubyObject begin(ThreadContext context, IRubyObject index) {
-        Ruby runtime = context.runtime;
-
-        int i = backrefNumber(index);
-
         check();
+        final Ruby runtime = context.runtime;
+        final int i = backrefNumber(runtime, index);
+
         if (i < 0 || (regs == null ? 1 : regs.numRegs) <= i) {
             throw runtime.newIndexError("index " + i + " out of matches");
         }
@@ -656,7 +655,7 @@ public IRubyObject end(ThreadContext context, IRubyObject index) {
         check();
 
         final Ruby runtime = context.runtime;
-        final int i = backrefNumber(index);
+        final int i = backrefNumber(runtime, index);
 
         if (i < 0 || (regs == null ? 1 : regs.numRegs) <= i) {
             throw runtime.newIndexError("index " + i + " out of matches");
@@ -686,11 +685,12 @@ public IRubyObject offset19(ThreadContext context, IRubyObject index) {
         check();
 
         final Ruby runtime = context.runtime;
-        final int i = backrefNumber(index);
+        final int i = backrefNumber(runtime, index);
 
         if (i < 0 || (regs == null ? 1 : regs.numRegs) <= i) {
             throw runtime.newIndexError("index " + i + " out of matches");
         }
+
         int b, e;
         if (regs == null) {
             b = begin;
diff --git a/core/src/main/java/org/jruby/RubyRegexp.java b/core/src/main/java/org/jruby/RubyRegexp.java
@@ -781,7 +781,7 @@ public static IRubyObject getBackRef(ThreadContext context) {
     public static IRubyObject last_match_s(ThreadContext context, IRubyObject recv, IRubyObject nth) {
         IRubyObject match = context.getBackRef();
         if (match.isNil()) return match;
-        return nth_match(((RubyMatchData)match).backrefNumber(nth), match);
+        return nth_match(((RubyMatchData)match).backrefNumber(context.runtime, nth), match);
     }
 
     /** rb_reg_s_union
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -3590,7 +3590,7 @@ private void subpatSet(ThreadContext context, RubyRegexp regexp, IRubyObject bac
         // this cast should be ok, since nil matchdata will be < 0 above
         RubyMatchData match = (RubyMatchData)context.getBackRef();
 
-        int nth = backref == null ? 0 : subpatSetCheck(runtime, match.backrefNumber(backref), match.regs);
+        int nth = backref == null ? 0 : subpatSetCheck(runtime, match.backrefNumber(context.runtime, backref), match.regs);
 
         final int start, end;
         if (match.regs == null) {
@@ -3613,7 +3613,7 @@ private IRubyObject subpat(ThreadContext context, RubyRegexp regex, IRubyObject
 
         if (result >= 0) {
             RubyMatchData match = (RubyMatchData)context.getBackRef();
-            return RubyRegexp.nth_match(match.backrefNumber(backref), match);
+            return RubyRegexp.nth_match(match.backrefNumber(context.runtime, backref), match);
         }
 
         return context.nil;

Original file line number	Diff line number	Diff line change
`@@ -781,7 +781,7 @@ public static IRubyObject getBackRef(ThreadContext context) {`
`781`	`781`	`public static IRubyObject last_match_s(ThreadContext context, IRubyObject recv, IRubyObject nth) {`
`782`	`782`	`IRubyObject match = context.getBackRef();`
`783`	`783`	`if (match.isNil()) return match;`
`784`		`- return nth_match(((RubyMatchData)match).backrefNumber(nth), match);`
	`784`	`+ return nth_match(((RubyMatchData)match).backrefNumber(context.runtime, nth), match);`
`785`	`785`	`}`
`786`	`786`
`787`	`787`	`/** rb_reg_s_union`