(groovy) branch GROOVY_3_0_X updated: GROOVY-11564: SC: `StringGroovyMethods#plus` for string concat fallback

[emilles]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new f58592308e GROOVY-11564: SC: `StringGroovyMethods#plus` for string 
concat fallback
f58592308e is described below

commit f58592308e9a4a1010dda8cd30fd28b05a3d01cd
Author: Eric Milles <eric.mil...@thomsonreuters.com>
AuthorDate: Sun Feb 9 09:04:32 2025 -0600

    GROOVY-11564: SC: `StringGroovyMethods#plus` for string concat fallback
---
 .../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
 
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
index 7e1eebd44e..523a5c0dba 100644
--- 
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
+++ 
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
@@ -750,7 +750,7 @@ public class StaticTypesCallSiteWriter extends 
CallSiteWriter implements Opcodes
         } else {
             mv.visitMethodInsn(INVOKESTATIC, 
"org/codehaus/groovy/runtime/DefaultGroovyMethods", "power", 
"(Ljava/lang/Number;Ljava/lang/Number;)Ljava/lang/Number;", false);
         }
-        controller.getOperandStack().replace(Number_TYPE, m2 - m1);
+        operandStack.replace(Number_TYPE, m2 - m1);
     }
 
     private void writeStringPlusCall(final Expression receiver, final String 
message, final Expression arguments) {
@@ -762,8 +762,8 @@ public class StaticTypesCallSiteWriter extends 
CallSiteWriter implements Opcodes
         visitBoxedArgument(arguments);
         int m2 = operandStack.getStackLength();
         MethodVisitor mv = controller.getMethodVisitor();
-        mv.visitMethodInsn(INVOKESTATIC, 
"org/codehaus/groovy/runtime/DefaultGroovyMethods", "plus", 
"(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;", false);
-        controller.getOperandStack().replace(STRING_TYPE, m2 - m1);
+        mv.visitMethodInsn(INVOKESTATIC, 
"org/codehaus/groovy/runtime/StringGroovyMethods", "plus", 
"(Ljava/lang/CharSequence;Ljava/lang/Object;)Ljava/lang/String;", false);
+        operandStack.replace(STRING_TYPE, m2 - m1);
     }
 
     private void writeNumberNumberCall(final Expression receiver, final String 
message, final Expression arguments) {
@@ -777,7 +777,7 @@ public class StaticTypesCallSiteWriter extends 
CallSiteWriter implements Opcodes
         int m2 = operandStack.getStackLength();
         MethodVisitor mv = controller.getMethodVisitor();
         mv.visitMethodInsn(INVOKESTATIC, 
"org/codehaus/groovy/runtime/dgmimpl/NumberNumber" + capitalize(message), 
message, "(Ljava/lang/Number;Ljava/lang/Number;)Ljava/lang/Number;", false);
-        controller.getOperandStack().replace(Number_TYPE, m2 - m1);
+        operandStack.replace(Number_TYPE, m2 - m1);
     }
 
     @Override