Merge pull request #32679 from Ladicek/logging-panache-stack-discipline

Logging with Panache: fix LocalVariablesSorter usage

Author: gsmet

core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingWithPanacheProcessor.java

@@ -137,7 +137,7 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
                         locals = new int[numArgs];
                         for (int i = numArgs - 1; i >= 0; i--) {
                             locals[i] = newLocal(argTypes[i]);
-                            super.visitVarInsn(argTypes[i].getOpcode(Opcodes.ISTORE), locals[i]);
+                            visitor.visitVarInsn(argTypes[i].getOpcode(Opcodes.ISTORE), locals[i]);
                         }
                     }
 
@@ -162,7 +162,7 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
                         // stack: [logger arg1 arg2 arg3]      locals: {l1 = arg4}
                         // stack: [logger arg1 arg2 arg3 arg4] locals: {}
                         for (int i = 0; i < numArgs; i++) {
-                            super.visitVarInsn(argTypes[i].getOpcode(Opcodes.ILOAD), locals[i]);
+                            visitor.visitVarInsn(argTypes[i].getOpcode(Opcodes.ILOAD), locals[i]);
                         }
                     }
 

integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java

@@ -40,4 +40,12 @@ public void doSomething() {
         Log.error("Hello Error", error);
     }
 
+    // https://github.com/quarkusio/quarkus/issues/32663
+    public void reproduceStackDisciplineIssue() {
+        String result;
+        String now = "now";
+
+        Log.infov("{0} {1}", "number", 42);
+        Log.info("string " + now);
+    }
 }

integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java

@@ -40,7 +40,9 @@ public class LoggingWithPanacheTest {
                         "[ERROR] four: foo | bar | baz | quux",
                         "[WARN] foo | bar | baz | quux: io.quarkus.logging.NoStackTraceTestException",
                         "[ERROR] Hello Error: io.quarkus.logging.NoStackTraceTestException",
-                        "[INFO] Hi!");
+                        "[INFO] Hi!",
+                        "[INFO] number 42",
+                        "[INFO] string now");
             });
 
     @Inject
@@ -50,5 +52,7 @@ public class LoggingWithPanacheTest {
     public void test() {
         bean.doSomething();
         new LoggingEntity().something();
+
+        bean.reproduceStackDisciplineIssue();
     }
 }