From fdc631d595104a84cc859750e83471d69f90b908 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 2 Oct 2013 16:06:59 +0400
Subject: [PATCH] Increase ABI version after changes to package fragment names

---
 compiler/testData/cli/wrongAbiVersion.out     |   4 ++--
 .../topLevelMemberInvocation/twoModules/a.jar | Bin 1441 -> 1420 bytes
 .../broken.jar                                | Bin 769 -> 767 bytes
 .../objectBinaries.jar                        | Bin 1291 -> 1289 bytes
 .../duplicateLibraries/DuplicateLibTest-1.jar | Bin 3211 -> 3210 bytes
 .../duplicateLibraries/DuplicateLibTest-2.jar | Bin 3211 -> 3210 bytes
 .../MissingEnum.jar                           | Bin 1428 -> 1428 bytes
 .../jet/lang/resolve/java/JvmAbi.java         |   2 +-
 .../withLib/fakeOverride.jar                  | Bin 977 -> 977 bytes
 .../custom/TopLevelNonImportedExtFun.jar      | Bin 1934 -> 1911 bytes
 .../basic/custom/TopLevelNonImportedFun.jar   | Bin 1919 -> 1896 bytes
 11 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/testData/cli/wrongAbiVersion.out b/compiler/testData/cli/wrongAbiVersion.out
index 2e6d10b255b..18b68d92a0f 100644
--- a/compiler/testData/cli/wrongAbiVersion.out
+++ b/compiler/testData/cli/wrongAbiVersion.out
@@ -1,5 +1,5 @@
 WARNING: $TESTDATA_DIR$/wrongAbiVersion.kt: (3, 9) Parameter 'x' is never used
 ERROR: $TESTDATA_DIR$/wrongAbiVersion.kt: (4, 3) Unresolved reference: bar
-ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong.WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 8
-ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 8
+ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong.WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 9
+ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 9
 COMPILATION_ERROR
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/twoModules/a.jar b/compiler/testData/codegen/topLevelMemberInvocation/twoModules/a.jar
index 7bb8c5831ad8d1fb8ca6f12293c90e0f309e512f..8307a0930ff1cc4e950d1abcd1b469bba557ad82 100644
GIT binary patch
delta 984
zcmZ3;-NVfr;LXe;!oUH9t2&$}@>(&2D6eWTbwait$a7{u0@6TsqP}B5Vsdt3da7=s
zZlZx%ilMQgrCxGQVsWu;pTGBE2Z5va&DOq*pS|j;*ul+QreTf(t{SaQ8#4k=)=t(-
zyj`+gMcRJq^jBw_<qz<y`Xv?W<v+7ctNZ--^H0_XOtNie<?O+7Iu#mKdydziU!V5(
z^uMjV#~z&dsa>wT&guKb`P~O@Y>?>slanaHr(T?Rr#e?@rP=SrGupiup5b+#`umb_
zq0-h(9U+Mtk`rgxHJ8>rx;Qa(O*l`^oTbZo$~4ZHY}b&#9_YNciAkpIQ?3I`<~s=~
z=e0tIr+%!M!ewQ2#dy*)7p;#I^lAn77u4G;E&sLVvW0;1Oy0Z8LnL>K%=1xM%Di;T
z!!|kZ3ra2%<q}?`xLk^z#g%cuNnAAK<W1$}jr)^c$LzY{RxE6}BvSPL#j4Z0jmrLs
z_nW<(R{X2+nw9(3&6eN2TW+0iRF#=<?ZjE3>Yh*f0p9E!w+&?j%^4XO76UOfTG$}*
zGP!_Br9SwwgGAju-^nvBa2ST1yl~p+!2!mshJ%S;CZ&mN^kAH6b*kdVwrurW&n-7A
zJ{|wTyr-hr<^%JOz&`0eRzKvv-F*JH;@jQlzm9*`X1LA4xh~_VdXj;la%M9Jck;);
zEz6Xox9<A8QAR_WZK2vWwXOuM$Q2z4Yx2Kv^wuw)ofK?Se?!{M`r^Lc=+cM{u@(iK
z-#k`Lj{Ns8?Zt*Zt39iVW(&ylF3l<}GWFej->838?XOJ#b6qCqdG;<|d|!@Bm1DlV
zc}>*$*}sdwMHOD~y|JXY?4RSFo0>mA`<Iy)-oBG%cc*Ia?{|mhu+6(ZrCI#lqs>P&
ztdFnuW^cP#U0oj<{A_l;w4h;8gv;_Ko=>)pHAf8}mz~*hSf_dRa$zIg+v@eLLdiED
zEBco>=@j4F<|D-W-!tZ=MYYp)=E=f)lcsum+D&Qsx!7d#@u#Wr=gzs-uQGmjde0o*
zCzrP<J&c^W@=MUSOG;O-TAVIYo$@cAQJ%*%<e)&9n$zwzk;3~Ied8^TH}w#D_v-Sc
zh`WbRUD-eP%ktuXr|akPe9znBtCPu7lICdqU!Ytdrh!Z69}6fh9oa92t^~%TG!rN;
z8JR>F;F)Z45{m^Wdrh9pVh^V8v*-$f@)>gcOHY<%m1YL!ugUhTQt}{KWD^CDawG#o
R^yCUwc`g&6ZB8s82><{opauW{

delta 1031
zcmeC-UdYWG;LXe;!oUH9pSRde<h5c3QC`(x>V#}Pkmt;R1muD2M19AA#N_P6^i-AN
zqGXjsl|%!x6hmV}OTFZr#NuMxzO!D39Yk8so2>QxpYtle`N1mgw}&EF9Yq$3a2;Lb
zs`}g0swMNXr>C0T)Y-4jweml3?lj+6VV?fZ^32b7-_Ji6Z{RMGka@?q%qF7#LqN%8
zl^37%?Dx<5s{i}Cnnbhh^YwRncW~Wxuh(PBJ(QsFd2?%;#jG=}W$%+^J-5D;P_>ES
zTADABb!YlKk043y<_s}s*Y1$-l0B1y`@O<E_ar4ews~tfW8sC%hZfb`aggoR^4cJ|
z=5_-|(0xOb_KjYq;kO<Ks;x+oIPVc9T)*;&^R_RppAP-)m~*Rmj%uUC$(q7>MoXUt
zRTxd3!Z)SM^m<7|mzm<J5(Z~=^-1q8g*gec$%F(dr}xiM``5OXyKqDAHMLEipEdU{
z{u{PO=gpsbn|n*5%ic4;Ep5DY{`;Zz0<RV@gcW#1shj(sF<cWL;LXnQxNvi@H6sJV
zaz+L|29)@joWZ10pMTjwp!V^N!p{%4`AHp^(7n`URqHJi&G=UCK5h+P=UD-+Suax`
z>r9+{g{}H*=l;XJ+~!9b<qz~btvP(X(elmhncttieN*%Q<5%ehJ{_ltTkjY@)4w_A
zwZfrqO?%VVigG_+`>^C-?LuYufSdn<1WXPJUsQWiHkb3@uj{uwlJ+00mwNNy;F{VS
zc9%8=y2(`uvWjs2n$x}6qH1^Eo2h|q6Afp#yn5Nx9cC}ITH#ObSC!eBQa%-PSORBE
zF3vmgJ>AFP(DCJ_lgk$W3iQlZ({G!%=}rIn`x{RmzGC-t0sr2j>*ub^zl*<9eOdaA
zjgj9i-}SdG?@8Zzr_%R$o1XmgeaZdxzrw!<A2&R?cu$^CsK@e2iNcj#j;3q9!wxE~
zHQMx2^6uRd_nxAVt2xK*!c4YC7PxO&p0$;Gdd7s$T-ozC=6T#x?!6(K$#S(jZO(>L
zsg^&fRklw*TFzdVvh;_RSMq#&{!K@umM`R3_fy4#>Ey0N2~M>q%Y|nIEKuTR4cq1^
zkQHdO`f>P*_<&zJ6APT@Rd(LId&=y0xM%&8==uMGwRY_McCElWDKu<bYTCB|$FHUu
z2haI~BK0Jvuly!pq^dA60OORANrVBO>m~=XSb*}|<Q^7#Fnx|iR}hr(kP-re{A3<h
vX?AFao2<nu<pENGY^nfKHf3N)2HJzjsF0i);LXYgQp5^`7C^TIvw(O2xWT&j

diff --git a/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar b/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar
index 1e6926f8ba3440e5c91ca390417e3efbd49dcfa7..b42c5758714aacf26ea5c91253711e46e5db48a4 100644
GIT binary patch
delta 339
zcmZo<`_IZ7;LXe;!oUH9t2>+~@>(&2D6eWTbwUA5z1FTj;vmqn`g8W9b-Q%94#j<9
z;;Z<&Mb0Jg!}Prsua2b6RPjq#{`hd^2gVwW!j5kXXK88d`}ObVAEtsn%ZDCES66a=
zI^cUe`lO>`?$2i5^Lg3tUWZAY6%^*O@7e8k&PrA1eN<qvbw>W(`p-=PMY-miK9>~~
zDu}c^>7B}%R%Y}3V|~KZrQcFYYiFbsPPH>Sx<z5xD<jX(IkKUyCQoHsIiG%J*}ZA6
zfZu$#<=<k>uHD`>eQR;^Cbq8QOoBpxVq5-t2A??;-!y@B`uzm{quM7H|6vXAX6I;^
zOP_t2fq~&S5C?cOGKnz2!@(IS#J~h1fPj;MWwIEP1}G>dJ2KgW>1HMaP9WbIY{uk0
LO!jPF89{0R@pOvR

delta 339
zcmey*+Q`Nm;LXe;!oUH9)?4f*@>(&2D6eWTbwUA5z1FTj>>$#5{%pQ*bgm|slX)d0
z`<-2@xL0nu@XOhJUEZSrwNBv|cYYM;)iB6=$t1mh6mzceaCu$b{(X#hlALCAl`V?f
z`({Vhj|IUK{Imb1T-{{5A~*82S5QmKnbN--FPZlWJewWW9aVlwsygeQV3FS0IQh9R
zb6#*NJAFBKh{bf@oce<LeI7~0TO(p!JR^?y`zW66Sh=JBkx3+*s~AtEbDh&aqXTk2
zt2wWq-z)lg;rC-RH(mA4wod#g(k{v5@?$?kdh;=f-}dZ^AN6XFaNLwWq4=LUz?+?8
zsg322s|*YbzkxWwn~_O`0Ui?0Kp_Su5CH_7lZBYHKtVCtp2;3eH!>M;0{PBh6DIFs
LvS<6w2vP|EUwei1

diff --git a/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar b/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar
index 2c0a8d755189aa4d27d2667db7932af03162d1a4..72beb54369a63cb7d420db8764266a0e7fd9a1ba 100644
GIT binary patch
delta 780
zcmeC?>g3`L@MdNaVc-D5H62b9d99d1lvg#FI-vljUTf9g>b$)xGm1$t=!zW!zl&~@
z_$n{8tevhQ4x%fwDrfAtz3JeMpt7^l@~sssLR9P;`ki{1Q<vPGX*}I{di?(N^-MQh
z=WlqjrSx#&OmoMUtCIB(6VDxe`XR&W^2}@}!ACR84u{{myMxIo<8;=%m+kZC+*r1u
zuiGbIc+p4R`@s+Iovtqmme}qe@co@XNAF(NoW;FiEc}Ji-W<*w!<2q>aPIq^p`$2y
zT{nKZ-z#^^Xzd(9|FbUV*J^UBUT&XMbFPo`SDyK^tey8c&ba+QdhtZ{w}+1^)NN}+
zN~`z$d-kUA>(u*vFB+mgHh2X3+?`Ms{IuP1)&&29pV``*mt7BNwy+GT&w5ojNoL6@
z?~orYo-6$nN-yPw%*#G>YsVRj`5*3lFu8vGtNP)+@pm3yxU%5;I;}ZB*Qg(p>Rjd;
zXjNvk{b=8tSI&Bh>%;Z+XICsz-g2ba`@*sZQBn2}=Efxcv<}<<aQ&A5>bae27Y{aT
ztCa3YTP-Z+x90ETy?cMm-l4opd1K!K^{>-kBs~^M+4z$^z?+@JW!rYuNsJ5(oJ<T1
zDDgLWCzE#l5eI>m)t|E;t=px;btvu=6JN#GEpje_AExiEcy%Ogrix#}^2diOKQPv4
z6n1=DI7>@o->-i^|1cHwSw8eQy1J6{(*fV((I*`hbALAbp3lpE_c~1Kte`NLea~*U
zb5^Q4@1p{XtuylP)_-maD9Sb8^tr5{P(h^SN$*t7v@)CLAL|pQF8!8LT00}9aH^fr
z(JczgUKx3Q&XEmuHF+xA%K7v&%kE8k1^ni_E&mp4cJ21A>067NH?egcXA%_p6Wj9F
zGx*G*_@)W0)9)wnAJsmw_zx?{$L(_IvoA9+F#HDM0B=Sn5e9ggbp{GC00ROHI2l+b
rKVjAYCELmTEcReJki~!l$ae;X+T>0a6HX8ZY~bW$EcR@NnL#=M*r{U1

delta 780
zcmeC=>gM7N@MdNaVc-Bln=N(|d99d1lvg#FI-vljUTf9g==8p8qT9%!+0=fBIWT&v
zxR#3W);mgC3%Ww4+WFjJHIs-wwXX8<VgdfCE3WWASS;|^K{B)a*_o$jo?d@HKb)b=
zKw-<AZFwe|pVc}xSUq2Fb86=g3#(aYOP|dOXsK9t_r=n(>+2c>Zf%N6`SmbeeVgW*
z$4ZyKb6k8f>;1-p_v!UJHG8U^0;0b!Z#ni)sO*BHbyNF}X0by7YorBhj<DRXHJUcT
z=hd|JUg}>T&si(Fts^~cmH4$Ot&?6xPpUcB$N9@o|5;Y*1&%Yv9{jv`qq^$b!wPHL
zyKAdz<Ldv`t^ai_zpcdKZH31Yjb(8j)+;|9R`5Ns{6S>%;l#_?D-!3(Xw{p3w(#T&
zda9~bb7V<~`2?#>bG`GXiMc^(bNnk4E2h1E{A=>Vd%EunGqNt!M~j}Txfq<>>vDOK
zhOG6>+ey)7UlpfMxW0b+bYGi`g0~*+)XWGj(0%J&p)MZrv+?TtAKG*OdzQOSe(~TS
z>m;j~%~v_S)vx{gcrWUo?;WwbQzODJsQ=>rvZ0V`(~UpO0p9E!-}926Phw<X;ACQ8
zK#9M}JDIfW4?Bpoo<Ex}9G$Dl<z!yT$bM(nD(;nAF8p#fUzhhNK&?~w#ho7odNmC4
zUNTAVAH|$&JX~H^w|^hwog}9jU1f{n_P*JX^<zQs1pn-RDOWeyuE>pi?G@D0a;Eg}
z#!KeC0?%egbw`z7lB&+SCs?F+Hco!-%bXXS%1&R-9bz%vH>bX!exFBD@z#h~7te?z
z{yvIlJ67)Ke`FHL<|@Wh>0IaZ&**@h&uY%==l6<!Uikgk%uQFlv#k?9inL2Ix%}AA
zkluVu;<r7!;zzyOBOEuSPbmHe`+2F2<&Ucj3=F@4IKZ2cNrVBOYMp^X48WiO1J210
qn6*I3b}}!EJ(%`qG2j65ok5{Cxt+y?6T|@<H~9#QJ=;-ckUjvJ31G?q

diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar
index a52d47d5033d081cd555a19c18dddfc001e458f1..8f3b55848e558cc103daf6777afcae5c12aa6984 100644
GIT binary patch
delta 2390
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
AO#lD@

delta 2391
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

diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar
index a52d47d5033d081cd555a19c18dddfc001e458f1..8f3b55848e558cc103daf6777afcae5c12aa6984 100644
GIT binary patch
delta 2390
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
AO#lD@

delta 2391
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

diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar
index 7523ae2bc0fa55e9769c661450990e3961af7a32..826bfcc401c7871c0259ea2126a6984504b58f65 100644
GIT binary patch
delta 918
zcmbQjJ%yV$z?+#xgn<JH*L65e<h5c3QC`(x>VyKAdaYC+>n-glvNt{5-YU}kq}wNf
z)>GRqL``LD-L@z|LUrrbm6KR%0=YI9PU)N-TcD=<rTokFF9+ox^iS#&JbC!9)t%~h
zw%`9fye}*G_JUDIbZSoclvGhchqIl3RCl-Ptlz!-r%P|H3(pjvDR1SpfAg>|*y_5t
z<ZxJ2?9}3U%S{$>gw+3E*n9D5>H0ao_wPpth^*N5Z=HSot=sHN|GK|=KUKG+GQuNS
zCT#LfyWs7|HX4+xvHzTY$?L-XwPmNSo;;d&hCO<|l>XrvZ*SiJI{)_Oi|N13jvv?F
zyHWRAc)9wo^9E<bob<o7Nmg}C=1K6l@a%@*ndglj50!g@6x><*BDT03dQ|UFvT3$~
z#iygI-)M7B*vih{RH^xV{buHZ_lM^>w3i=RV0uDe!&$34=d%`Pm05?ympr^u+P3-9
ztCd!l-JZ8b*&Nx!Soy@7`(^9or{98mlcrZrIcK|kTK8#|sG`tMy|1oVs7qx1V-N6V
z=ZIh5n3KxLz_1aB5m5t*hRMB5%Jm2HE;|U+CRb0k>bq^FIwfF&0Y_(1Mu>{u7N<>3
zj!PN6q+CO6b1yB;d9-Hfn`Qrxa&|JyU+8!03D)A1`PO@{de+UE<$r%a*JsfG&~TyP
z)ULes6RurzY&pAf&!oFfvrfNT{xQTiM%GSop4Ro+^>@~)aJ-h^vh`NXvoy>5vn`#j
z)W`Rp>e1xqSi+HQ?sYEYiF|vrvD4cC>9=vhf6{j^R-4r!&9T9c<BoYQ=h=VzYj^0r
z440RmzV5=au<R2X<yN*{UHb87*Mw^QC6im$_uqQ!x3B!$sjZX0oc{CBF+{xV_mbyl
z``Dd5)%8zbZsflABks}rcaz-}-(G$`rAWW)a!Zv+eek68wL0IFCzf7Xp>~h;=3|pD
zS#?^IBA;=7G&$2@%vJT2b^i5N(}g2@o;aN@T-YZ1p=|lnBE!J^Qdg_yrG-`N+-_x+
zt<IQJvd1ER*XQfjM&bW=dOR%Dkr9_a5gBG_m}gwQ=}|+)KW6Fs;ooeJJ?ri8Rf(xB
zk+8i|IRCX+wXSJewEK?cZ<Z$>>6P7Bk+$w5x2ROdKVU?$b7V2^zdjWhX<|&Eh+||D
pVSwkV$w@30;250CVh^V8vlwsyW7HWG*^|XtO~D+H0h2>m9RS%mvr+&6

delta 918
zcmbQjJ%yV$z?+#xgn<JH9k$p_<h5c3QC`(x>VyKAdaYFd)=Sz^WN&)9{hS>0lWw1s
z#dK~vtu{5$_|e#8F!9FvEvkZl7K@}k4pCdT`+<*04d47@^0f@|UNXU5_V2DgyjT2w
zCx8F<`p%4IF~>Vv$<>Q=R(CLD`90nGMs$<S`@g4_XC)~oEl63F^M3ZG{|gzuJX;#L
zD^Yvxx>J_t_nR!@2&w<Su=nEAp9|*1*6rG$pb?OpT51t*b%S~7;q+JUr|One26!aP
zgiYRQ7Z!eOqe1yIrW5v)!<ydhdOKzH{N>h$@}=9QPbZ!!d+Yo6`>!_{_v=n<{OVpG
zBd)!^eA%zEIceSt#j79lFdy+`Gf>GW&f$3W*<r~CK{w3_%1rJ$QA&x0^$J!uT_tM1
z9liaAn|s1m_u7MdrhG1sl)rQPj_8XIeiB>UB$>8_wf~NMyJA+X@0Epmb9SAp2#cy+
z*|+s#<-$0*q<hUapXRo1d62U6Z^+^ssd7t;&#!#?NU1Syr`Aue(yTcGJf`y*0=(Hd
zCjRfQNM&ST*a*akr~yU8<X$G_df)uZ4g$5w)t{g4SR3rb$;ufVx=2P!w3FM_Bg|lh
ziG%0jj#bNjcTMq~vvtbdFZEwTI+^Vo<Xa_{hsapGk>2~=WV7-6>+j|58TTAeb~>#2
zde`2VsAyI}vt^&W%8E1fcF#W^Y+4xlqa|Zi%=hM^@<|G7YOh?&DxNv>X-)kzj>P(U
zQ!UeF7Ag~zuH;SaS$V>amp#4ZRCex`YUdC0-}cVRP|8v`Af;Gvf2*p=@BiN(Zrc%G
zR}-@%X14WO#p6{=#KOdnJ=e~<Q>{2xrKb8)UiqfKo5R=1s>eU?=Rdq^L$tbWewmGg
zmsMrt9KM(j*S;s!zi+Tvb(yi&Q{(d?jn0+s^@2wuZ+R)(i)5;EYCo!-VCVZP?x??u
zjkm30*=x;0H^=om9(<1ao22x4VoZkRxvLvk?!DU*p{Mq0uAXQ51{1&YS3RQ7=1KNW
z?h}9Rz5Rcc`?FW};+!^pt&bluTb?#jKc<^zt<Bf*+&p4`+)aLo+1r)O1d6|2O#BjX
z)Op?PH(O0-<jOsiyY*b5`}d8s#d9Jbhlgh<{9y(~+>a9_0#kvJCdLGcI7TKB26(QT
loWx=Qj={Ms_F(!xivb5PMx8;CJz1R96wCn`Fgb+P0RZ%ip9BB^

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
index 26611bce03d..6f3cfaa7b99 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
@@ -25,7 +25,7 @@ public final class JvmAbi {
      * This constant is used to identify binary format (class file) versions
      * If you change class file metadata format and/or naming conventions, please increase this number
      */
-    public static final int VERSION = 8;
+    public static final int VERSION = 9;
 
     public static final String TRAIT_IMPL_CLASS_NAME = "$TImpl";
     public static final String TRAIT_IMPL_SUFFIX = "$" + TRAIT_IMPL_CLASS_NAME;
diff --git a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar
index 22d2c988d22fae02418ba80e6e76f5e14f324654..ecf51a2d503834310e1a606134830fe27ade7447 100644
GIT binary patch
delta 516
zcmcb}evzFwz?+#xgn<JH*LOHg<h5c3QC`)|>wwe=H8Ay2uiku{_nb*hI~BICQdp=c
z6eDoKYqp0=>jDp6uhs{fHf}EozV7x>jI;Cp!T%3hjx@?2=y&Rgb?7*}XZz=8&erdb
zpU=O~_<-?_3y0CyIMJC}m-?L_GAeBe|I{q=Y*U5#9Nlm&Q@I-)54~nSEKdFB!P6N2
z^r=<o_w&3>wNcYr%B#8SS&q+n$(30A>-{Trj(5Sa8O0I~40~AlS~xCliTl0CWT)P-
zoolqRvQI9JTT#07^r2<(MNu<6l?CniclEsQebc_Y=(Z2rcDdA0`@X(=azEno>y0+g
zZT|WAWy-a(xzpR{zl&I0{q)a`o3e`AcWrb?kx14*BoeFtXh*Z$uSB7TH@NBzt8}fD
zw$!RUI#Pb~h@ds+_89BLi#s<++<we-)U%u4<-b?I)ZMkEMQ0?Z&vbg>b2{W1_s(lY
zGgpV3UNHT9Y)SeqzekTxA9}&P^}^I;t2DYUc{sO+O=xhPHo>!Glj|PFIUlT2w`*?b
z(?7e|TOx+@0@MD75Ar|j6~-q2UBBVye+G-+wh0Hzn&s{&+*@?Z^wceP0mtXO39Qlk
z83Mf7Idop{*t?LCfkBCh0mx@$5@CQx=;SL*7N8iN%+G8Oip$A?%w`-w+8Ly0azC>Z
E0D&>>;Q#;t

delta 516
zcmcb}evzFwz?+#xgn<JH9k<v`<h5c3QC`(x>Vz7Y`lwegdt24d^I*(`=+FrlOoU<t
zE_luMaA{rO!OP`TaPvm=jVoWnK8kU6-aq*NLCcXw`2+n<J+TfQhxcs%{LI<<{qghp
z_Zc79-ErY4u2ei7GwtSa#qSJ)x3oVx@^A<4lRh_1d!{6RPD_UB*$*>K>Q&kvg#Rj<
zd$QTMIbnX5Z^icQ4)q0RszViX{Qk%Ol{i?t$SbwaiQ`~?BeS5B&D!gB*Ovu6-60U_
znyb4pgnQ?@DSElTp0eqlX%*y{&mQ~ieeWCg<w>`F*tW|(3$^d;zc0rYmtSwRdG6t#
zi(jT(E1N6sKL1_B;_9lpM{oKrY~RJ{o-!jr{}@lK{<lJQTb@NG$2N-AC;pjLUXjAy
zqn`O-Q|ICGp!-E{ryNbclazD*`HA?ge;D7#zbst5d#hicW%69_mUAKLiy}I<3Y~V^
zx2AF3Omj8c(9%hBVy3yxJ>9xWB(yRzOPNPD%8^Sf(n;;&NwJS?KU%J9?)Gggt;v*&
zJ@mn=L5zjBy?%Ci=WD6g^{r?Bvs>JF&&a(^`pW~hk78HX1zxjjld#HX(7y4DHNcyl
zV_7cuuZ4^Z3`$H43<2JZOd<^M2%UU|$pRFIllhtL!E_+A83&N>4AL{XpV<ij?eyb#

diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar
index 65814ae7788918cf97713a9e665648f243580082..a0a71fc6d5508af663e996f206a7e54cfa5f66ab 100644
GIT binary patch
delta 1458
zcmeC<|IWu7;LXe;!oUH98#<gO@>(&2D6eYf^+4)`yfTn-W<UbAKz3qMvc6+dazJ8o
zc4B&}?qohj`Fh>7#MD&7)HHLw<ebFf;@$w?d|^Y8In#4IgSn<K=r%G7J(?hQY8C5B
zcE8yz9^8T<0dMc_uI!wX_vS>Q(vQd(%MZ*y0z0<LyRK|unKsY<*u0tM|9-yy&Cift
z;bak>Ddv`0ws4cS>Ep@XyJbGNedfP*q<d-UJoWtjKQ7*?*_K^D{o~0H!}*`S>|s@s
zIdj#mb*Ith56M=~&uqV-V)MWK*lBJ53afdW`R_;1&knBcpEFDM#t-ur+o`Ww?s`RE
zp5k}ACH7^pkn2Uwg*UDJvKHKbKVPsZE=FN*(51D#*SY!rURTXF-ulq`Tj#0kH4EoN
zZAe%D)i_bNaZ5-{HZNOqcuV~^?&FfLd3Q_6@wKn#wBEbp3kO@7(vfpF(zN`iT-G}K
zbJGl!@5@hFUDVb+Aiw{F#OtZkb+kRh{vPxY?|J8Y?3(i(cV@;e!3EuB-yAAbmRql2
ztJR*amzNwrPb~aA*N<Oa1sb30SRcsorPyi-c<Ly%?ACVN{php&mviwiWf$5Xa6UY%
zPUq?lPy00uv+C}$Pjzzd&0V;5np8!M*4qv%71@W=LbQ*)%Mb8o=Xm43vug??1H*PE
z1_ngr1LJw}2PXCUYX8dtA_vaDOx{|Zxtx{##|w!=S2i9{aOqUr&OBXng-=YA)Y;r}
z!`8J&*E#=<_~-uTF#m&gqj{&7B^hk=e82PgSL@}r&wux?zt4~$`AqQBozK~4KF=@y
zKViQ(o5G=`%ynn7ZRPf@xBbl5GGAhW(v-5ri**Zis{9vkxN6_^$fcy-++MZ6?O}I@
z#P6h!297%%b^y~8r(^7j5`k;~o`wHsUiq$AaoUl8vlzuUO<+>yRa<gA=6dOL!7Z)R
zSoCvbJC=y?A69wM9rfv_2g}2{kZPSteD8UW7R!C!=i#!)Pf{^f(BOoVSka`6iPxlp
zrF-3E59%C0Bz|yX$L4}m5fekc`WrWHL^xg$j|ws84qvD-H<)9(zjcL>>RttzdO1<=
zV*M8#6#^~`z3gu;`4l^^;K(ud+lJ47AKkTjnNjM|y~2Al-s^3={&nHrx$|C&YsVEE
z{@(a2>(f)~?Z1nD=kBe4n`l&7{p{YvjQhD^-281j{Wg{TNUOat=f%&fdw=cAUtg0`
zziQX^nfm9quL-()E&8+E?Cz%9XKvk#7IUksDt(hbtM%qpucL?9mho_JY+y?(;wxSH
z<ifpVnc^D;C+)j)o8R~`mp-}ddffLl+xD_kU0q>n1v28kq55wuc64t3$>kdr?!%*_
zqgmY+=y)|$t>pF*p}g$<mD`HnPuZTeNp?-vth4no=Zv!4(#51+edYOjIqlfWcQd@a
zN=sf($lPU_Zj{oNlvejK(|oJjm8Fq!cetEBmfZO6vgh<(xk#?)iRY_j<=BJdrM=%?
ztSf19bZEQpeejThSA~<Y)P*B%tG{bZkUYBI_#8_UD_4esJa1Q#IpaaaTsF7<GNzgO
zDl2v7YEJr8A2-F?eWuYSw_RIa1*->4Sjcte(o9*&he9!Gm1aA2_8O`Czdy?8D)O}K
zAG3L-T>5|Ubm6{ll|8%tgC<@KzN~KWx82-uQ(xsLHR+?pPduOM{Pa1`b!P6Nk{zx=
z%g#+GTg!U=;j!!kjCcNUg7U(b)ZX0Zz<e-?1(X*UnMAl4;AP=tbv6r7VK_O7%^p-5
zPF}*MZwM+5kuwmeI7EQEKqi*L(F(0_1lt6)2xK6#D?|{c0a<q@C$cMZ#Q<|FD;r1x
E09Dd@+yDRo

delta 1434
zcmY+EdpOg39LIkwbBm2M*EK?OI>k9wZX>Ooj?3CC=ENakp+k%@*K-WHWG=;Ao+6bF
zVa;;cio`Jydq`~(x#aFFv^uUy9D2^v)A@e?cz-_6_xpVQ`n+DN%GnSlA`Y}m4UpTu
zC+d&oC|QAa!ZGekbRv-39TxcJV76-?U$P0tmrV2_2l)i}8H7{G2Fwp&1l_>j$ItIa
zKYw#$@<pHU@GK&pB08>CT=>x7a7qDiI1!{O(0lC7Jvs55$%J-6F*5m*pjpG$eeQO1
zcv3v<jPeE$uQu`Vj#2(q@3IGoIy8#1GRu+J0>$H&<0snF5l_0x9IIaz$2H(%&kP3g
zwF$QV2Ry4y=c3o&b!5Gw&)|4G`Bi_$$GiZFhc18oL~!2CgQ!*8c141xBA(BpUubHM
zOjc*gptrCy&cT6OHLi<>+EJJRmzwN>87mZC%)?*6aYVXu1o@s#2NLK~>saR4a+|cc
zFgG%|*sE63T<uomKGPDQUK!C-D5x?-^GYR}gR1tp6mEYg-NG6<zj6q9&-`Lg^bxJc
zdh<(d!ZvMx7rn>>?xjL|clJachv7h_SKrgW5hS&_Cev}AVA++6t9=XUX!MSdnDX{b
zsA#<>?uMM5_k|?irN$-%K7T+JPaIpB{w-{|Hi5#Cvon>P0hB|H=E4%~eO2_VyJZ#_
zz4Yg3dRf%Z$(tHZf$Qm{N#oBI(t+#22$BNaoR`A;HE_(mvR?n~)rjOcXEt=<4G||R
z*RX+N6-oiXBWVEm-wrUv(nxwRMPv_62<Wd7^=LnAo%R%Dh^DSH3MzWiLHqUCBdXN;
zlsqqjP9vl!!lMB{F9?er?ro&(MXX6}RET=aq!`D24JGqUHmK1XSGFE+0YK6HBx3Go
z40cJDGc`uq$2z3TU)~dAtc}%#n|rM|_38E`B@!(!_eS<LXuWHvpALwCAuFwh;|q@!
z{luAcFeO3=F3FaBxPqP;G;=)=a(nq`ixmO<5|L14=Uk~oTMB~BD0pMcWOb-0p5#-J
z+_hM{wmCHNV6XwxNXf1$XEVH<|F==dM!B#=htT)^way$zS7B-9<!m_(*e&2BzTRQ3
zy8;6}q7r@dG>E>pg!Lz2UXD?$OJK9v=b+uOX>Va;$WU&$%I)6=TQe-+sW0Z$E8Pey
zZ6%H!K02BaFTzQi#B$Xdn=tEUQ)*GO&oryM1<^8UI{>8=?V06x22WM53_%p=9FqbU
z*DCN`+?A+v8x8%V=xDV<g#YNmNC=z;OPV!V_4pv5i@32H<?ch={!O<x!TX-F_@jT+
zRd#ze^eexA@?9iJoZWtD*g39`eG%Tf@q2s>I><fs=_6I8dZqM|-cw7St;wgyPPSS<
z>!iHCn>2sa82SpO`E=P3mQ^sRXIz&n4!tKg)LE1i*MiDe%+A`4OI;WvmQD|bm_xyJ
z_zzQx^xhw4k2syz?9E8i=7+|FaVI`@Dv4>V%=NCc(Xx<dQ8vRJ(?W7$bC*S`*)Idg
zV`ncw5yCjHA$fhSx#qGfRreFNwp;Q9WI5ku(6`?0HhA-yy@^iR`88{e{fr4x`4WK~
z%N4KLDAH0t(K_;v-%rGVmjnr{**#EeVSzWj(Nz8FR-r+D*~tFN-s%#xpf5*B$bISA
zln?_KcwbxL_sPAwed?b;s%spLklq|bW`r&$$IC`7dK52Wi?J5h#hUNr9m?;hQ_lXy
zHfc(!q;-gpBS!Jq=C0~o&QkZSNO{zFK&}-ny?zM(5ES)BI(vL{Yln*rC&uSR*ftc`
zckO^7C9MX0)gx04Y_TIorW4rqOXh%0RCWycEle2Z3ot_Fs}-dTm@2Ybh@D?wM*lZi
W?Hi{8z$DXAR$sw;8%GWB&cnal@RBY7

diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar
index 2958dd9c039884fb633842144aeb8e018f9230f9..2363847668e363a992791c8caacd3bfbe61e32a3 100644
GIT binary patch
delta 1423
zcmey*_kxc%z?+#xgn<JHH*`2n<h5c3QC`(x>V&*9kmt;R1gwDU#H3_>$E4(d#N_P6
z^i<u+e2g;nx{0aArb%f=CVI&^iN(de0lxXdh61&db3B8&a+$ZV@J$tH{}K?k<l&Lb
z$r?clO<b$?R-0cw@$y)ojCxSLSUBGwhB}d?Z;Lgi3M4K0c;kHC`?EiuuYYgPQ1Y?q
zLa?Wln`hO^OVXx~KWp!v^Pz3C|Fs@*@7Ff|?%AKOu8TeOyuM5Sp6d0xam+3jb5{3q
z8K<T_e4cV{W&Q#`i@(zk%$D}Au$;M>-#%)7X7J9wIkR+c{P^BtJN3nkyI#@3)8%Hj
z#J(($a=jSsw6|C+++qLy_d-qQEZnVHmqbgi7nk{UTQ$2l_b~sP<f&_a23c-RIPdp`
zSvi_1^JL*tQwbhDj<eV6`+~1Ymx<cQ@Kv|WJ-6cn2V0rek!wemX?0J%tab8-Ry@c0
zeN(P&jLT&F_rvvA#QHsFHcdKt%3k8-oQwO;->B+Pz9OK|&yZ`fk^PXdrLB|Xm$e$X
zHb?f^oL%o%{Nr6$fzInX&Ib(bLH<Q9YGQ(i9#376`|&4#)$8?Nrd^o-Ak)>+e)5{T
z%jKs#xbA=5%(Zaxt!)>=yiINNr<A$K8p%FvOiAv!dq2RNokKWO^~EGc28NAH3=Aky
zKlv?_dVQ|Hu%kdj`nM|G+vc_(4jk5sW7O0#2{2(4IvaO!8CRCzEQQXr+v}bz*sFY9
z``G-a=8xFx8|+V6c&|<}*>&>mn?1J1+pXjG*ZyN-SiPZP!t}Leky~!9Px<X4w^Bsm
z(ADHhwbQYZGE?KX^@UpdH8vV-7N3{5+W2a%Aluh_nG#3qSA8xK*u%#j7_B@12uJdf
zR~(9A0zH?KgcIME|G2cD!#gNcZp*#(>y{?yaC>?zZFH_;`D&9dsu;K`J1g^d#L=f2
z0!Qlnr#|jqev1EI`_pu-yi@NS_D-7kW@Uuy>?wj51R4M8q$n=$6wCZ7xHW2Rn81&i
zCAUu52M3C+<84-RXRMEoj?U&tTj^K2xj<It?HsomJ6=4flqmn3@FhP)M>o1I*tOQ4
zhi6xu-&1R&X&wE{x1Vy`E`KC>@{G*qcdhHozlR-3Oik$iQgc2s=jyc0^3(45yxsrV
z>bG^i_TJh3k5=w({TjTrdjGb~yCwB(cExk?Yn{G&@=)B_$kji(58bkis1Hr6O4=88
zG}$^l{AaXhoUeG+Ubn*68Bd-+-s~TAa>>I_Z7$5Z&Wm0f3dgz|B&JmQ8B90+H2Yeo
z!fzY#4)4yEw-rLg$CkZSI=5+0X0Z;}=@T=WcK_BnS$Wr~t@7}ujoOAUqx=?Y@uba6
zdMtk4;JAtZ5{dI2?b?S5D)KhIs5(*4`_k;0#Mj9m?{eRj$=~sVCH?bjCfmt{Uvzag
z$=B>Uk#%EX`JPR0*<T%9a6RbayqwaLM*C#9rEb?$j(@G3Tv%=)?YsZ|<cH54IutmP
zB`^Q}@^Wii^7kv(CC|N=oX&KRiH-AuHe=sBZ-)X;?E?j>=M+D8s!UyK>lrj();532
zO6B^~OR`s6*77~JnsQL*?ahUP>khG;JbkkG*6QL<Ut(Vdw=7owtiNNWec`wILbHb%
z)7*FPPV#a0zi-hly}x3z^Xrb~{<{MIG}|22o2>u!Ou|2=v_rC!thPGbI%{>OX{Pf5
zyF35*K$)N=mi7GuU<T-50c8S4CJ_cm2?#3mCQGwffax$cdoVqNO<xdH3L@tmtI0Rm
n<Qc&wpA}lkhio258?s#@NChba!}ZBQ?8;n`z|8oQ6(j)w9tw4!

delta 1446
zcmZ9Mdo&Y#7{|B8NG_vA(i)j-WrYw9X7mcp+|pcPW9F_bHLaR7ZAj4~MqaNX6?18=
zts{~ctv4}8xy8XL%w-{>%U=4Uqxbp!@%{bI@0{oP=lOglRAs6vSdUF|P=MmvL315)
zRctq{hdcFGw8M?oUTDCEa#*|L3E@Z-AsmYjkHwRS2y#+5f~5r9Nkia?76%ED=9XsR
zad<L08+$ZS>;$>M;v@E@^MHXMhPyFiG0im)fxuwO+^#5^R-O;F6G!=yVAa;StB?3e
zBMQ<xkg@A!e$LF?NYe65<8tKEr<yrOfU-1AifPS&zw9V?Pv|M83XYx&=!<!!gK;Dp
z26N0M6f0a&4Xv-=aM1VsPpigV!CWVLOM1VtqkrTq?V46GUz1H2(>6CWo}%9p%iGDq
zKl;SSe9G`&Fwj{psl7*l)%}|s$?hf<z0Efxp&$)<mfuL;D$0x&V6%iF-;Few>9=_n
zF+9XMUL<)fdv4}4$wub+dz^`L9k!@9$jMiZt?r7VoyNSM!C{UkzVDS%>>G8b7hAep
zbchyuXDV=I-EO$*(VI1y>C!0=B5X2vi&Ti*Z%BUCu~*=E>_@YU*45byZN2E7{{Yoo
zDH8-Os;)gttnY^!e%0NIo)(Emr?{ze97SRMYyd#@r16)#P7wrkJ^MHEGnt*Vw|2Dh
zv-HD1<-B573nRuHe(*stt08bdrQ4RgbY5W0NXmV#{#4GSq8cJdufGY1^-xe$ua9fL
z1q1*dg8+a(c7QbwGNJ|fik+as&OQX!Bwp9)ITS)gO{AW7zl2J02N48*O63;qUu)yF
zl)0NLOs0hM*`J%$Mi@zh<=gNlEiL*UeOj_BnwAMW6NiCe+8-g7fr;bQ=f+a4%q9<I
z0d^~gzKvxkde7O*co&;@;N=kX!Uwd+LJscXG_`yw4^FS5tvr>$R)$KO^Uct7W75HW
zB2!(r1;LINt7r;ut7W~cEW%_Dr?)ddU^gVY1>iy`b*@t5#Z$FWCCJV5-#^H2SwOwp
zGGrxUgmMZbw^vqRn!QmEMXFIw1A8Ny!E@5Dn!q8OmwI|k+hz9)55{a<<qqo9g2^>F
z2&3*q7lqaoMkbTxQH99Qf>RVwg`1)J;Y6=m31i<o2@MX{yp#N-E$y0wsv&Fjc4$0;
z&g5%vH%aEiYsN>1?f00Lmrc|L)?%_k?r0Rn7YSCEe7=jb#-rM~Rpdiol4#3Aqh|z9
zXRmWQ{uYUKNaf=%6y_*D*wI-7kBnOLJd%lKv@(@SOk4~#)XQ$~y(uDNy1}uE&>x(T
z&+YKH?h+XtHV;ZDzu}y&Z0N((_AJE*GBe`{9H%%!nfZ%_pn@*Spbs;%H?a9eTMs=C
z^DGzYsl9FB29r}+cr)9yk6op!ci@Q7eFyA*sex&w+k6^Z+=a3@Cluk}i7A|G(MdFo
zjBzZlgHNa|XrtHTnG2Aa-Y2J{v2{H?2QnU<JMvc=`>syYN-(>A%zA~WIwRP%=j=eT
zreE~4R(*Zy#ml@H%aiHDY87f!(0u{ymcpzbKBWZSofGQA2*r6(YeKs44%7SqMO#P?
z%HF)dxi~dv^aFHp*9sWilq3?)(~?tz>a5czDEBH~lS5td##OE|eL&icZB*3uE8Yon
z)+E<si&5WUQ&J`0_5~zALufPBWOI3pU;2$7FsR{uySU*}hhxL%6Wq?NcBioCT}pJ9
zJC@&ghAnAUJSQi(N}$UX9#Uu|252Xp)>_BGV8KLfY7K>4xpf>=fFLN~w-s56V4HOx
zve011UzrX@s;`T2BSQ|XRxn)tw+wCnCqt~qA1%=v=Rr646#y7v*(vBNg{+~e3|{~E
E55`!A=l}o!