decompiler: Setup increment/decrement test properly #376

testData/results/TestSyntheticAccess.dec

@@ -5,31 +5,35 @@ class TestSyntheticAccess {
    private int i;
 
    private class Assigner {
-      void assignI(int newValue) {
+      void assignI(int var1) {
-         TestSyntheticAccess.this.i = newValue;// 32
+         TestSyntheticAccess.this.i = var1;// 36
-      }// 33
-
-      void assignS(int newValue) {
-         TestSyntheticAccess.s = newValue;// 36
       }// 37
+
+      void assignS(int var1) {
+         TestSyntheticAccess.s = var1;// 40
+      }// 41
    }
 
    private class Incrementer {
-      void incrementI() {
+      void orI() {
-         TestSyntheticAccess.this.i++;// 14
+         TestSyntheticAccess.this.i = TestSyntheticAccess.this.i | 1;// 14
       }// 15
 
-      void decrementI() {
+      void incrementI() {
-         --TestSyntheticAccess.this.i;// 18
+         TestSyntheticAccess.this.i++;// 18
       }// 19
 
+      void decrementI() {
+         --TestSyntheticAccess.this.i;// 22
+      }// 23
+
       void incrementS() {
-         ++TestSyntheticAccess.s;// 22 23
+         ++TestSyntheticAccess.s;// 26 27
       }
 
       void decrementS() {
-         TestSyntheticAccess.s--;// 26
+         TestSyntheticAccess.s--;// 30
-      }// 27
+      }// 31
    }
 }
 
@@ -46,27 +50,35 @@ class 'pkg/TestSyntheticAccess$Assigner' {
 }
 
 class 'pkg/TestSyntheticAccess$Incrementer' {
-   method 'incrementI ()V' {
+   method 'orI ()V' {
-      2      18
+      1      18
-      7      18
+      3      18
-      8      19
+      b      18
+      c      18
+      11      19
    }
 
-   method 'decrementI ()V' {
+   method 'incrementI ()V' {
       2      22
-      6      22
+      7      22
       8      23
    }
 
+   method 'decrementI ()V' {
+      2      26
+      6      26
+      8      27
+   }
+
    method 'incrementS ()V' {
-      0      26
+      0      30
-      4      26
+      4      30
    }
 
    method 'decrementS ()V' {
-      0      30
+      0      34
-      4      31
+      4      35
-      5      30
+      5      34
    }
 }
 
@@ -76,10 +88,12 @@ Lines mapping:
 18 <-> 23
 19 <-> 24
 22 <-> 27
-23 <-> 27
+23 <-> 28
 26 <-> 31
-27 <-> 32
+27 <-> 31
-32 <-> 9
+30 <-> 35
-33 <-> 10
+31 <-> 36
-36 <-> 13
+36 <-> 9
-37 <-> 14
+37 <-> 10
+40 <-> 13
+41 <-> 14