Fix stack variable

Author: coehlrich

src/org/jetbrains/java/decompiler/modules/decompiler/MethodReferenceHelper.java

@@ -256,6 +256,7 @@ private static boolean removeInstanceAssignment(Statement stat, int i, Exprent e
             && assign instanceof AssignmentExprent stackAssign
             && stackVar.equalsVersions(stackAssign.getLeft())) {
           newExp.getConstructor().setInstance(stackAssign.getRight());
+          newExp.getConstructor().getLstParameters().set(0, stackAssign.getRight());
           stat.getExprents().remove(i - 1);
           stat.getExprents().remove(i - 2);
           return true;

testData/results/pkg/TestMethodReferenceJ25.dec

@@ -4,9 +4,7 @@ import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 
 public class TestMethodReferenceJ25 {
-   // $VF: Variable merging failed for merge VarExprent[10000,0]: {var10000}. Code has semantic differences!
    protected void test() {
-      Object var10000;
       BiFunction<Object, Object, Object> c1 = this.getThis()::test1;// 8
       BiFunction<Object, Object, Object> c2 = this.getThis()::test2;// 9
       BiFunction<Object, Object, Object> c3 = this.getThis()::test3;// 10
@@ -44,86 +42,86 @@ public class TestMethodReferenceJ25 {
 
 class 'pkg/TestMethodReferenceJ25' {
    method 'test ()V' {
-      0      9
-      1      9
-      2      9
-      3      9
-      10      9
-      11      10
-      12      10
-      13      10
-      14      10
-      21      10
-      22      11
-      23      11
-      24      11
-      25      11
-      34      11
-      35      12
-      36      12
-      37      12
-      38      12
-      43      12
-      44      12
-      4a      13
-      4b      13
-      4c      14
-      4d      14
-      4e      14
-      4f      14
-      5e      14
-      5f      14
-      60      15
+      0      7
+      1      7
+      2      7
+      3      7
+      10      7
+      11      8
+      12      8
+      13      8
+      14      8
+      21      8
+      22      9
+      23      9
+      24      9
+      25      9
+      34      9
+      35      10
+      36      10
+      37      10
+      38      10
+      43      10
+      44      10
+      4a      11
+      4b      11
+      4c      12
+      4d      12
+      4e      12
+      4f      12
+      5e      12
+      5f      12
+      60      13
    }
 
    method '<init> ([Ljava/lang/Object;)V' {
-      4      18
+      4      16
    }
 
    method 'test1 ([Ljava/lang/Object;)Ljava/lang/Object;' {
-      0      21
-      1      21
+      0      19
+      1      19
    }
 
    method 'test2 (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;' {
-      0      25
-      1      25
+      0      23
+      1      23
    }
 
    method 'test3 (Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;' {
-      0      29
-      1      29
+      0      27
+      1      27
    }
 
    method 'test4 (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;' {
-      0      33
-      1      33
+      0      31
+      1      31
    }
 
    method 'test5 ([Ljava/lang/Object;)V' {
-      0      37
+      0      35
    }
 
    method 'getThis ()Lpkg/TestMethodReferenceJ25;' {
-      0      40
-      1      40
+      0      38
+      1      38
    }
 }
 
 Lines mapping:
-8 <-> 10
-9 <-> 11
-10 <-> 12
-11 <-> 13
-12 <-> 14
-13 <-> 15
-14 <-> 16
-18 <-> 19
-21 <-> 22
-25 <-> 26
-29 <-> 30
-33 <-> 34
-37 <-> 38
-40 <-> 41
+8 <-> 8
+9 <-> 9
+10 <-> 10
+11 <-> 11
+12 <-> 12
+13 <-> 13
+14 <-> 14
+18 <-> 17
+21 <-> 20
+25 <-> 24
+29 <-> 28
+33 <-> 32
+37 <-> 36
+40 <-> 39
 Not mapped:
 16