Merge pull request jruby#8417 from enebo/triv_parse

enebo · web-flow · commit c679b93cf869 · 2024-11-10T14:55:24.000-06:00
Trivial refactoring for match
diff --git a/core/src/main/java/org/jruby/ir/builder/IRBuilder.java b/core/src/main/java/org/jruby/ir/builder/IRBuilder.java
@@ -1734,11 +1734,10 @@ protected Variable buildDefnCheckIfThenPaths(Label undefLabel, Operand defVal) {
     }
 
     public Operand buildMatch(Variable result, Operand regexp) {
-        Variable tempLastLine = temp();
-        addResultInstr(new GetGlobalVariableInstr(tempLastLine, symbol("$_")));
+        Variable lastLine = addResultInstr(new GetGlobalVariableInstr(temp(), symbol("$_")));
 
         if (result == null) result = temp();
-        return addResultInstr(new MatchInstr(scope, result, regexp, tempLastLine));
+        return addResultInstr(new MatchInstr(scope, result, regexp, lastLine));
     }
 
     protected Operand buildModule(ByteList name, U cpath, U bodyNode, StaticScope scope, int line, int endLine) {

Original file line number	Diff line number	Diff line change
`@@ -1734,11 +1734,10 @@ protected Variable buildDefnCheckIfThenPaths(Label undefLabel, Operand defVal) {`
`1734`	`1734`	`}`
`1735`	`1735`
`1736`	`1736`	`public Operand buildMatch(Variable result, Operand regexp) {`
`1737`		`- Variable tempLastLine = temp();`
`1738`		`- addResultInstr(new GetGlobalVariableInstr(tempLastLine, symbol("$_")));`
	`1737`	`+ Variable lastLine = addResultInstr(new GetGlobalVariableInstr(temp(), symbol("$_")));`
`1739`	`1738`
`1740`	`1739`	`if (result == null) result = temp();`
`1741`		`- return addResultInstr(new MatchInstr(scope, result, regexp, tempLastLine));`
	`1740`	`+ return addResultInstr(new MatchInstr(scope, result, regexp, lastLine));`
`1742`	`1741`	`}`
`1743`	`1742`
`1744`	`1743`	`protected Operand buildModule(ByteList name, U cpath, U bodyNode, StaticScope scope, int line, int endLine) {`