From 404783c874d5d3b209995f22a9bb8ac640bb35b9 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 29 Mar 2016 17:52:23 +0300
Subject: [PATCH] decompiler: Setup increment/decrement test properly #376

---
 .../pkg/TestSyntheticAccess$Assigner.class    | Bin 753 -> 599 bytes
 .../pkg/TestSyntheticAccess$Incrementer.class | Bin 928 -> 914 bytes
 .../classes/pkg/TestSyntheticAccess.class     | Bin 1012 -> 902 bytes
 testData/results/TestSyntheticAccess.dec      |  74 +++++++++++-------
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/testData/classes/pkg/TestSyntheticAccess$Assigner.class b/testData/classes/pkg/TestSyntheticAccess$Assigner.class
index c15e644dbe8e817ab9b3a02a21438b287b356ff2..4ebd715b0d13441e9e5adde75b14eeaf08bb901d 100644
GIT binary patch
delta 275
zcmey!dYwh()W2Q(7#J8#7!)}fSQ&)47}ywuxfnzkL_vfYJA*hogVaQo41V^+;^NHo
zJWoaj77b6$u*s~9)_l_J3^F_nvJ7%O4Dt*Lll>S~B{&?x%2JCM8F)PN@=}YObATFC
zizgQ{POVpBU;;u01}-h_tqhD>+ZmWP0(n4{K#~neGcYItF)srjkj)KbslnB6VPKTr
z!N44jP|pQ6Nri!vK^3TyAFf9Us25}h8&Ew9s(O&&8bD8K0u=}V*-Q+A43a>a3#f$^
J=vxT}CIJ5%A~yg4

delta 408
zcmZXQ%SyvQ6o&s9b1~EL(yDE>+9qu(S~m&>7X?9G1zbv8M+r6%A~cFipJC|Irw|my
zg%98h_#D1K@FYqUWZ*xSIsZ4q`OrRf_dR=k12Dv<1s$sb2G#^xSkGm{MB7A1x#RuX
z$<;*=`@tj%&g1Yj7Y6Nm9Hk7ihiMvJCgFrZdI`njI7riwZn|o>sWQtMF__e%A&*>J
z-nLJ!B)s*5_=Y&lQ}?5)ZNic0q9@^^&tR*)hRQ0_9-H0`!RY{Eu=4~qcm{u<ibIkb
zV5Du#k;)<$m`9Z=poS&tR46+t36Ef{7tEaf5=6naVZkXV_3yVziioj{l>%Kafd^FQ
jUor@${e!u*&Hf*lQNoNL7Dt2J98D}z6hzZ$<qP0nPD3@L

diff --git a/testData/classes/pkg/TestSyntheticAccess$Incrementer.class b/testData/classes/pkg/TestSyntheticAccess$Incrementer.class
index 631d4376fac9b9bd6e82deaa4223162f527b7883..d446c62ee10cfbbb1947afdba7c8b76961f555de 100644
GIT binary patch
literal 914
zcmaKrT`vPc6o%i~R;y!C_5E42Xp43$A`&7IiKK~eQQ>;Kov_qac9+DRza$|V7k+>r
zCC(|TQtM*R&Y5}Mb7tP1eS3d-1+Weyh8V^rBqk&#F~wn;!wiQchglADQOrlNAQ17-
zZ7*#Ij2~QIo)wOj=a=ss|6KXDwQE_*^R@`uwjJBw5tzyZQrQ!M@Ls*D1o{tbM;+c=
zRg`;dR%$d8s=FnM8HS|oSgyKKj!#pvs@js)O1XW7lXCsWwbZ`N#m4^FWd6duHFfkr
z*U^ha6pK2RkkOGvPRBBjRyeF8ucLsxKq}z4>C*T1lq=BlE7MDkqujlk>3PZ%h;!3I
z&2-KRN0kd@`2wQ>Rp|(3)6KMDklFwF$gZ^5HG%11&r8`~@MgPm<0mN^>rM09;9}9h
zEL{~zw?@R{Y#fau(8#?$&?ls9o-&QzGPnE$k$Z;rz%=4bQcz^g01{t(9w8b5iQFUM
z^fV9(-!~9G{n5#0#XeGThryP1ft0L`ed@Y8BnfmA4h#iJA{~+ul8lmMxFwnU>eAIf
kv;&_&n0^dk<S)Ft1D_#0NvGis8pe>Ox1{<pDw2Zs0gt||8vp<R

literal 928
zcmaKr+e*Vg5QhIv53y^swN>l+)T(U-o1&<o2qFlDq8BZCoyNsRYbr?;d@Mmxyzl{h
zC~-E_HqgeK*`1x)Z~vK0zJETy0PJEb0TuHcBUs>A#F8}2(yU0cs$xw=jv?-~EH|$+
z%+?<6Zpsbedi7`9YYERXPfSy|?ja=|S+?aJGb|KBvx=7t(bLYgU`W<1Tbw`MH-*zM
znr%8s*E*)rzBC+5`rX5*e41gjYMYL@7q%xH2CZt_!Z~dlt}7_G9`;^7aElaj>km?8
zh!mt4el5COI_k&k!H9I~okzzMXO`4CGo=3QTjR;lkO0>(iYXO&4eQv@uqjOeMGYks
z8FC^03o2zuNm{vW*f-^i=B+S2hHS`1(q{NyAg}8O|My;2*vsAPI~9G`Z$}_rspwdt
z(HNmAVX2g?i*_+6RGbEeF@Jg#@&R7jdIKxHLwO-j!8qAC<$yAizLk596f(2|lbGrf
z_Gy)|MCldm1Cgsffcxli5|9i)5<SRt7$iCXNfRV96q4;hcDhPpABYVArV&Lp0EqQe
g%nSp>2LN*fm>&XAFiX`dm_wRYP8wAD>n5Q50*<Pzng9R*

diff --git a/testData/classes/pkg/TestSyntheticAccess.class b/testData/classes/pkg/TestSyntheticAccess.class
index b4e05e6f7756eb78c64f7f349d51143b6b730da4..364ce33cc273afe5ce79423d7b774011bd7b804a 100644
GIT binary patch
delta 406
zcmeyu-o|c!>ff$?3=9k=3~HPVEDZ7>LV=5cl|hl6L5ZC~nVms}k%7apxHvOCFSUq~
zfyXlsNIT~w78j=$vookpw0Gg>N=!~pEiP6uFfd?bkkOd9K$1z*bFw(2J~u+fV&W_F
z$-#`5>N$Xx@iFi-Ffs@LS+YQy5lFLYZD(NK2xKra2m(nqupqkt2ZIoUFp!O^bPEI1
z8Z1gh7(}5;<r$b6n1CwSwWOoAqAC^!*#<IL3~sQ><U%HKS9FWT5%NIOK)QIeB7ruu
zq@WuKGf{#;a`HzeU1ljDt;novEX^PTb&nj-H6T@NQjwb(7%|)ql$8a_GBL<azQZg5
E0Ejp-UH||9

literal 1012
zcma)5+iuf95Iti%-ryQq0`y)eZCa8%5C>HiQV~*B2`N$p53MStPj#GCx+Qgx*G2G8
zyl@i|4}1V0g_yNdY9uUSX?JGVXU?3Nv48&h{sX`cS~uWe(`<DQ6>JG?3p^5N5UTrH
zt5GZyg5QnV9*je+r50!sX1Z~d$O{>#<~?a%U0#adK2xzupA+mx^O)cqOooy$+f%W8
zd3iCA$x%2M^G&TciNf)5m?(3eUOMTSVy>m$o7bcEk<{to`#3$5sfzZaNNT-D@WRZi
z2f<UqYNHg{WIfiqpct@wedq)`nL-9#5q3I%fu9i8%GtX)eWwr}aD>yyUU-L-%OsL7
zlqq!aA9XxF58sA9X5jm{X|`LKB`lOwO_($I_Bf13?N@_y8Ks2v5^()`Y@20}!tk)p
zv#;>CV8JtbGLI#(6}(s%I6Zr9w#2s5`Ud+WI~H#9?q-()HTL}+fIGMg%vEs@^L%51
zcR7g(_FMfguuh!QudqJwxs1cd!jxmNz+o3SoZ-oTb1Y$bs$+vQn#cPDa!&i7K}H1?
zD`DL$1-$(S-*<*3_*JY;`S)OF8ANNPT;6;R$xCE<f%~R)ocIAxBX3y17}GF!`ATG2
ct6b*Er}mKX7B*02TVv1VrVF;_@AhE*1|-<4;{X5v

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