Fix return value inlining not being applied sometimes

Author: JonasKunz

src/main/java/co/elastic/indytransformer/AdviceTransformationPlan.java

@@ -414,8 +414,9 @@ private static void simplifyReturnStatement(ReturnStmt returnStmt) {
                                 .toList();
 
                         if (matchingReturnValues.size() == 1) {
+                            NameExpr replacedReturnExpression = matchingReturnValues.get(0);
                             Set<String> otherVarNames = returnedVariables.stream()
-                                    .filter(name -> name != matchingReturnValues)
+                                    .filter(name -> name != replacedReturnExpression)
                                     .map(name -> name.getNameAsString())
                                     .collect(Collectors.toSet());
 
@@ -432,7 +433,6 @@ private static void simplifyReturnStatement(ReturnStmt returnStmt) {
                                     additionalOrphanComments.add(0, comment);
                                 }
                                 prevStatement.remove();
-                                NameExpr replacedReturnExpression = matchingReturnValues.get(0);
                                 replacedReturnExpression.replace(assignExpr.getValue());
                                 returnedVariables.remove(replacedReturnExpression);
                                 continueOptimizing = true;

src/test/java/co/elastic/indytransformer/TransformTestSources.java

@@ -98,6 +98,11 @@ public void complexEnter() {
         transformAndPrintDiff("/ComplexEnter.java");
     }
 
+    @Test
+    public void wrapArgumentAdvice() {
+        transformAndPrintDiff("/WrapArgumentAdvice.java");
+    }
+
     @Test
     public void preserveAssignmentOrderInReturn() {
         transformAndPrintDiff("/PreserveOrderInOptimizedReturns.java");

src/test/resources/WrapArgumentAdvice.java

@@ -0,0 +1,11 @@
+import net.bytebuddy.asm.Advice;
+
+public class SingleLocalAdvice {
+
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void enterSchedule(
+            @Advice.Argument(value = 2, readOnly = false) Runnable runnable) {
+        runnable = AkkaSchedulerTaskWrapper.wrap(runnable);
+    }
+
+}