From a97bb80216e4620503092c93fe4760fce4799d55 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 23 Sep 2013 18:49:05 +0400 Subject: [PATCH] Serialize FQ names of Kotlin classes This helps to avoid a nasty hack with loading inner Kotlin classes in JDR, which makes it a bit easier to 'lazify' JDR, since now the container of a Kotlin class is no longer required to be resolved eagerly before resolution of the class itself --- .../frontend/builtins/jet/.kotlin_class_names | Bin 756 -> 756 bytes .../frontend/builtins/jet/.kotlin_name_table | Bin 5302 -> 5925 bytes .../frontend/builtins/jet/.kotlin_package | Bin 291 -> 291 bytes .../builtins/jet/Annotation.kotlin_class | Bin 10 -> 10 bytes .../frontend/builtins/jet/Any.kotlin_class | 4 +- .../frontend/builtins/jet/Array.kotlin_class | Bin 219 -> 219 bytes .../builtins/jet/Boolean.kotlin_class | Bin 133 -> 133 bytes .../builtins/jet/BooleanArray.kotlin_class | Bin 133 -> 133 bytes .../builtins/jet/BooleanIterator.kotlin_class | 13 ++- .../frontend/builtins/jet/Byte.kotlin_class | Bin 1383 -> 1383 bytes .../builtins/jet/ByteArray.kotlin_class | Bin 133 -> 133 bytes .../builtins/jet/ByteIterator.kotlin_class | 12 +-- .../builtins/jet/ByteProgression.kotlin_class | Bin 118 -> 118 bytes .../builtins/jet/ByteRange.kotlin_class | Bin 146 -> 146 bytes .../jet/ByteRange.object.kotlin_class | 8 +- .../frontend/builtins/jet/Char.kotlin_class | Bin 1143 -> 1143 bytes .../builtins/jet/CharArray.kotlin_class | Bin 133 -> 133 bytes .../builtins/jet/CharIterator.kotlin_class | 12 +-- .../builtins/jet/CharProgression.kotlin_class | Bin 118 -> 118 bytes .../builtins/jet/CharRange.kotlin_class | Bin 146 -> 146 bytes .../jet/CharRange.object.kotlin_class | 8 +- .../builtins/jet/CharSequence.kotlin_class | Bin 59 -> 59 bytes .../builtins/jet/Collection.kotlin_class | Bin 230 -> 230 bytes .../builtins/jet/Comparable.kotlin_class | Bin 52 -> 52 bytes .../frontend/builtins/jet/Double.kotlin_class | Bin 1359 -> 1359 bytes .../builtins/jet/DoubleArray.kotlin_class | Bin 133 -> 133 bytes .../builtins/jet/DoubleIterator.kotlin_class | 12 +-- .../jet/DoubleProgression.kotlin_class | Bin 118 -> 118 bytes .../builtins/jet/DoubleRange.kotlin_class | Bin 146 -> 146 bytes .../jet/DoubleRange.object.kotlin_class | 8 +- .../frontend/builtins/jet/Enum.kotlin_class | Bin 125 -> 125 bytes .../jet/ExtensionFunction0.kotlin_class | Bin 64 -> 64 bytes .../jet/ExtensionFunction1.kotlin_class | Bin 94 -> 94 bytes .../jet/ExtensionFunction10.kotlin_class | Bin 365 -> 365 bytes .../jet/ExtensionFunction11.kotlin_class | Bin 396 -> 396 bytes .../jet/ExtensionFunction12.kotlin_class | Bin 429 -> 428 bytes .../jet/ExtensionFunction13.kotlin_class | Bin 461 -> 460 bytes .../jet/ExtensionFunction14.kotlin_class | Bin 493 -> 492 bytes .../jet/ExtensionFunction15.kotlin_class | Bin 525 -> 524 bytes .../jet/ExtensionFunction16.kotlin_class | Bin 557 -> 556 bytes .../jet/ExtensionFunction17.kotlin_class | Bin 589 -> 588 bytes .../jet/ExtensionFunction18.kotlin_class | Bin 621 -> 620 bytes .../jet/ExtensionFunction19.kotlin_class | Bin 653 -> 652 bytes .../jet/ExtensionFunction2.kotlin_class | Bin 125 -> 124 bytes .../jet/ExtensionFunction20.kotlin_class | Bin 685 -> 684 bytes .../jet/ExtensionFunction21.kotlin_class | Bin 717 -> 716 bytes .../jet/ExtensionFunction22.kotlin_class | Bin 749 -> 748 bytes .../jet/ExtensionFunction3.kotlin_class | Bin 155 -> 154 bytes .../jet/ExtensionFunction4.kotlin_class | Bin 185 -> 184 bytes .../jet/ExtensionFunction5.kotlin_class | Bin 215 -> 214 bytes .../jet/ExtensionFunction6.kotlin_class | Bin 245 -> 244 bytes .../jet/ExtensionFunction7.kotlin_class | Bin 275 -> 274 bytes .../jet/ExtensionFunction8.kotlin_class | Bin 306 -> 305 bytes .../jet/ExtensionFunction9.kotlin_class | Bin 336 -> 335 bytes .../frontend/builtins/jet/Float.kotlin_class | Bin 1383 -> 1383 bytes .../builtins/jet/FloatArray.kotlin_class | Bin 134 -> 133 bytes .../builtins/jet/FloatIterator.kotlin_class | 12 +-- .../jet/FloatProgression.kotlin_class | Bin 119 -> 118 bytes .../builtins/jet/FloatRange.kotlin_class | Bin 146 -> 146 bytes .../jet/FloatRange.object.kotlin_class | 8 +- .../builtins/jet/Function0.kotlin_class | Bin 41 -> 40 bytes .../builtins/jet/Function1.kotlin_class | Bin 70 -> 70 bytes .../builtins/jet/Function10.kotlin_class | Bin 342 -> 341 bytes .../builtins/jet/Function11.kotlin_class | Bin 373 -> 372 bytes .../builtins/jet/Function12.kotlin_class | Bin 405 -> 404 bytes .../builtins/jet/Function13.kotlin_class | Bin 437 -> 436 bytes .../builtins/jet/Function14.kotlin_class | Bin 469 -> 468 bytes .../builtins/jet/Function15.kotlin_class | Bin 501 -> 500 bytes .../builtins/jet/Function16.kotlin_class | Bin 533 -> 532 bytes .../builtins/jet/Function17.kotlin_class | Bin 565 -> 564 bytes .../builtins/jet/Function18.kotlin_class | Bin 597 -> 596 bytes .../builtins/jet/Function19.kotlin_class | Bin 629 -> 628 bytes .../builtins/jet/Function2.kotlin_class | Bin 101 -> 100 bytes .../builtins/jet/Function20.kotlin_class | Bin 661 -> 660 bytes .../builtins/jet/Function21.kotlin_class | Bin 693 -> 692 bytes .../builtins/jet/Function22.kotlin_class | Bin 725 -> 724 bytes .../builtins/jet/Function3.kotlin_class | Bin 131 -> 130 bytes .../builtins/jet/Function4.kotlin_class | Bin 161 -> 160 bytes .../builtins/jet/Function5.kotlin_class | Bin 191 -> 190 bytes .../builtins/jet/Function6.kotlin_class | Bin 221 -> 220 bytes .../builtins/jet/Function7.kotlin_class | Bin 251 -> 250 bytes .../builtins/jet/Function8.kotlin_class | Bin 281 -> 280 bytes .../builtins/jet/Function9.kotlin_class | Bin 312 -> 311 bytes .../builtins/jet/Hashable.kotlin_class | Bin 48 -> 48 bytes .../frontend/builtins/jet/Int.kotlin_class | Bin 1546 -> 1546 bytes .../builtins/jet/IntArray.kotlin_class | Bin 134 -> 133 bytes .../builtins/jet/IntIterator.kotlin_class | 12 +-- .../builtins/jet/IntProgression.kotlin_class | Bin 119 -> 118 bytes .../builtins/jet/IntRange.kotlin_class | Bin 146 -> 146 bytes .../builtins/jet/IntRange.object.kotlin_class | 8 +- .../builtins/jet/Iterable.kotlin_class | Bin 48 -> 48 bytes .../builtins/jet/Iterator.kotlin_class | Bin 53 -> 53 bytes .../jet/KExtensionFunction0.kotlin_class | Bin 63 -> 62 bytes .../jet/KExtensionFunction1.kotlin_class | Bin 89 -> 88 bytes .../jet/KExtensionFunction10.kotlin_class | Bin 323 -> 322 bytes .../jet/KExtensionFunction11.kotlin_class | Bin 350 -> 349 bytes .../jet/KExtensionFunction12.kotlin_class | Bin 377 -> 376 bytes .../jet/KExtensionFunction13.kotlin_class | Bin 404 -> 403 bytes .../jet/KExtensionFunction14.kotlin_class | Bin 431 -> 430 bytes .../jet/KExtensionFunction15.kotlin_class | Bin 458 -> 457 bytes .../jet/KExtensionFunction16.kotlin_class | Bin 485 -> 484 bytes .../jet/KExtensionFunction17.kotlin_class | Bin 512 -> 511 bytes .../jet/KExtensionFunction18.kotlin_class | Bin 539 -> 538 bytes .../jet/KExtensionFunction19.kotlin_class | Bin 566 -> 565 bytes .../jet/KExtensionFunction2.kotlin_class | Bin 115 -> 114 bytes .../jet/KExtensionFunction20.kotlin_class | Bin 593 -> 592 bytes .../jet/KExtensionFunction21.kotlin_class | Bin 620 -> 619 bytes .../jet/KExtensionFunction22.kotlin_class | Bin 647 -> 646 bytes .../jet/KExtensionFunction3.kotlin_class | Bin 141 -> 140 bytes .../jet/KExtensionFunction4.kotlin_class | Bin 167 -> 166 bytes .../jet/KExtensionFunction5.kotlin_class | Bin 193 -> 192 bytes .../jet/KExtensionFunction6.kotlin_class | Bin 219 -> 218 bytes .../jet/KExtensionFunction7.kotlin_class | Bin 245 -> 244 bytes .../jet/KExtensionFunction8.kotlin_class | Bin 271 -> 270 bytes .../jet/KExtensionFunction9.kotlin_class | Bin 297 -> 296 bytes .../builtins/jet/KFunction0.kotlin_class | Bin 37 -> 36 bytes .../builtins/jet/KFunction1.kotlin_class | Bin 63 -> 62 bytes .../builtins/jet/KFunction10.kotlin_class | Bin 297 -> 296 bytes .../builtins/jet/KFunction11.kotlin_class | Bin 323 -> 322 bytes .../builtins/jet/KFunction12.kotlin_class | Bin 351 -> 350 bytes .../builtins/jet/KFunction13.kotlin_class | Bin 378 -> 377 bytes .../builtins/jet/KFunction14.kotlin_class | Bin 405 -> 405 bytes .../builtins/jet/KFunction15.kotlin_class | Bin 432 -> 432 bytes .../builtins/jet/KFunction16.kotlin_class | Bin 459 -> 459 bytes .../builtins/jet/KFunction17.kotlin_class | Bin 486 -> 486 bytes .../builtins/jet/KFunction18.kotlin_class | Bin 513 -> 513 bytes .../builtins/jet/KFunction19.kotlin_class | Bin 540 -> 540 bytes .../builtins/jet/KFunction2.kotlin_class | Bin 89 -> 89 bytes .../builtins/jet/KFunction20.kotlin_class | Bin 567 -> 567 bytes .../builtins/jet/KFunction21.kotlin_class | Bin 594 -> 594 bytes .../builtins/jet/KFunction22.kotlin_class | Bin 621 -> 621 bytes .../builtins/jet/KFunction3.kotlin_class | Bin 115 -> 115 bytes .../builtins/jet/KFunction4.kotlin_class | Bin 141 -> 141 bytes .../builtins/jet/KFunction5.kotlin_class | Bin 167 -> 167 bytes .../builtins/jet/KFunction6.kotlin_class | Bin 193 -> 193 bytes .../builtins/jet/KFunction7.kotlin_class | Bin 219 -> 219 bytes .../builtins/jet/KFunction8.kotlin_class | Bin 245 -> 245 bytes .../builtins/jet/KFunction9.kotlin_class | Bin 271 -> 271 bytes .../jet/KMemberFunction0.kotlin_class | Bin 63 -> 63 bytes .../jet/KMemberFunction1.kotlin_class | Bin 89 -> 89 bytes .../jet/KMemberFunction10.kotlin_class | Bin 323 -> 323 bytes .../jet/KMemberFunction11.kotlin_class | Bin 350 -> 350 bytes .../jet/KMemberFunction12.kotlin_class | Bin 377 -> 377 bytes .../jet/KMemberFunction13.kotlin_class | Bin 404 -> 404 bytes .../jet/KMemberFunction14.kotlin_class | Bin 431 -> 431 bytes .../jet/KMemberFunction15.kotlin_class | Bin 458 -> 458 bytes .../jet/KMemberFunction16.kotlin_class | Bin 485 -> 485 bytes .../jet/KMemberFunction17.kotlin_class | Bin 512 -> 512 bytes .../jet/KMemberFunction18.kotlin_class | Bin 539 -> 539 bytes .../jet/KMemberFunction19.kotlin_class | Bin 566 -> 566 bytes .../jet/KMemberFunction2.kotlin_class | Bin 115 -> 115 bytes .../jet/KMemberFunction20.kotlin_class | Bin 593 -> 593 bytes .../jet/KMemberFunction21.kotlin_class | Bin 620 -> 620 bytes .../jet/KMemberFunction22.kotlin_class | Bin 647 -> 647 bytes .../jet/KMemberFunction3.kotlin_class | Bin 141 -> 141 bytes .../jet/KMemberFunction4.kotlin_class | Bin 167 -> 167 bytes .../jet/KMemberFunction5.kotlin_class | Bin 193 -> 193 bytes .../jet/KMemberFunction6.kotlin_class | Bin 219 -> 219 bytes .../jet/KMemberFunction7.kotlin_class | Bin 245 -> 245 bytes .../jet/KMemberFunction8.kotlin_class | Bin 271 -> 271 bytes .../jet/KMemberFunction9.kotlin_class | Bin 297 -> 297 bytes .../frontend/builtins/jet/List.kotlin_class | Bin 412 -> 415 bytes .../builtins/jet/ListIterator.kotlin_class | Bin 118 -> 118 bytes .../frontend/builtins/jet/Long.kotlin_class | Bin 1546 -> 1546 bytes .../builtins/jet/LongArray.kotlin_class | Bin 134 -> 136 bytes .../builtins/jet/LongIterator.kotlin_class | 12 +-- .../builtins/jet/LongProgression.kotlin_class | Bin 119 -> 121 bytes .../builtins/jet/LongRange.kotlin_class | Bin 146 -> 147 bytes .../jet/LongRange.object.kotlin_class | 8 +- .../builtins/jet/Map.Entry.kotlin_class | Bin 75 -> 75 bytes .../frontend/builtins/jet/Map.kotlin_class | Bin 243 -> 246 bytes .../jet/MutableCollection.kotlin_class | Bin 246 -> 248 bytes .../builtins/jet/MutableIterable.kotlin_class | Bin 59 -> 60 bytes .../builtins/jet/MutableIterator.kotlin_class | Bin 50 -> 50 bytes .../builtins/jet/MutableList.kotlin_class | Bin 486 -> 491 bytes .../jet/MutableListIterator.kotlin_class | Bin 146 -> 148 bytes .../jet/MutableMap.MutableEntry.kotlin_class | Bin 96 -> 97 bytes .../builtins/jet/MutableMap.kotlin_class | Bin 290 -> 296 bytes .../builtins/jet/MutableSet.kotlin_class | Bin 246 -> 249 bytes .../builtins/jet/Nothing.kotlin_class | 4 +- .../frontend/builtins/jet/Number.kotlin_class | 22 +++--- .../builtins/jet/Progression.kotlin_class | Bin 76 -> 76 bytes .../jet/PropertyMetadata.kotlin_class | 6 +- .../jet/PropertyMetadataImpl.kotlin_class | Bin 49 -> 51 bytes .../frontend/builtins/jet/Range.kotlin_class | Bin 90 -> 90 bytes .../frontend/builtins/jet/Set.kotlin_class | Bin 225 -> 225 bytes .../frontend/builtins/jet/Short.kotlin_class | Bin 1383 -> 1383 bytes .../builtins/jet/ShortArray.kotlin_class | Bin 134 -> 136 bytes .../builtins/jet/ShortIterator.kotlin_class | 12 +-- .../jet/ShortProgression.kotlin_class | Bin 119 -> 121 bytes .../builtins/jet/ShortRange.kotlin_class | Bin 146 -> 147 bytes .../jet/ShortRange.object.kotlin_class | 8 +- .../frontend/builtins/jet/String.kotlin_class | Bin 163 -> 163 bytes .../builtins/jet/Throwable.kotlin_class | 16 ++-- .../frontend/builtins/jet/Unit.kotlin_class | 6 +- .../builtins/jet/Unit.object.kotlin_class | 8 +- .../frontend/builtins/jet/atomic.kotlin_class | 6 +- .../frontend/builtins/jet/data.kotlin_class | 6 +- .../builtins/jet/deprecated.kotlin_class | Bin 37 -> 38 bytes .../builtins/jet/suppress.kotlin_class | Bin 53 -> 53 bytes .../builtins/jet/volatile.kotlin_class | 6 +- .../serialization/src/descriptors.proto | 2 +- .../AbstractDescriptorFinder.java | 12 +-- .../serialization/DescriptorSerializer.java | 2 +- .../descriptors/serialization/ProtoBuf.java | 74 +++++++++--------- .../DeserializedClassDescriptor.java | 46 ++++++++--- compiler/testData/cli/wrongAbiVersion.out | 4 +- .../broken.jar | Bin 769 -> 769 bytes .../objectBinaries.jar | Bin 1290 -> 1291 bytes .../duplicateLibraries/DuplicateLibTest-1.jar | Bin 3214 -> 3211 bytes .../duplicateLibraries/DuplicateLibTest-2.jar | Bin 3214 -> 3211 bytes .../MissingEnum.jar | Bin 1423 -> 1428 bytes .../jet/lang/resolve/java/JvmAbi.java | 2 +- .../java/resolver/JavaClassResolver.java | 17 +--- .../DeserializedDescriptorResolver.java | 40 +++------- .../lang/BuiltinsNamespaceDescriptorImpl.java | 2 +- .../withLib/fakeOverride.jar | Bin 976 -> 977 bytes .../custom/TopLevelNonImportedExtFun.jar | Bin 1884 -> 1934 bytes .../basic/custom/TopLevelNonImportedFun.jar | Bin 1868 -> 1919 bytes 219 files changed, 208 insertions(+), 230 deletions(-) diff --git a/compiler/frontend/builtins/jet/.kotlin_class_names b/compiler/frontend/builtins/jet/.kotlin_class_names index 217d719bc653114f391b01d08ac58fbb7b88b6fa..4e0ee3cfd0b4272fc20c9bbfd736208373133335 100644 GIT binary patch delta 21 Ycmeyu`h}H;fq`KU5Q6~IMxGZ;05%TpF delta 21 Ycmeyu`h}H;fq`KU5Q6~YMxGZ;05%E)V*mgE diff --git a/compiler/frontend/builtins/jet/.kotlin_name_table b/compiler/frontend/builtins/jet/.kotlin_name_table index 4e391c72de62f0f9adcd71b7a28b7baacecdeda8..04184dd7125d73b4a86a946bf6fe77f007989c22 100644 GIT binary patch delta 977 zcmXxiJxmi}7{KxNYTDzB$$PZGl|);E14M!&8=(UWgC-i>YvO>zb?IV4awrOdm9G~D z7B<*yVoX?!Q4_*qQY}I&A{Ipj@e@!4`4Eo2|LOmGp7$wUu{tXkHH?^TCzA1G zYr-~s*RCcFU(CM#z-kn=&rcYd@EU&IBRrPpsG90A)qrY=Y!mh7DK$k@qjFLtDjL-k zQ*AnGNH&|1vt{DE+Fnq-sCr4YMfI{wnJ15zi@2Jv$X#<FOga4r2{k`08cLUr69pDzY z4LU)W=BW4Yu<8aq;4Vmkd!QHefqpOm27v@aU|6#P#p{pA(ctN7ON?V_sfEOw81ZBBJ1rnkBq{;n43d~{x>n2wSE3&W(oMW7PMDWt&T|&pWW-57hB5ZT7<*xigD}Pc2%|vY5KQDajBygm in7mg^SxrLVJctVlRDY=BE<)tl1+K$n7$$!c(+2>(usiVp diff --git a/compiler/frontend/builtins/jet/.kotlin_package b/compiler/frontend/builtins/jet/.kotlin_package index 1780444e4bdc059d158736044b43100152d1ca49..018f9e4dab2a3b0b133ec2d493f40ef5f21b7619 100644 GIT binary patch literal 291 zcmZusy$ZrG5N^&G&r?bWw3JLLWGM*MF^iC`qc7oWTlGb})R0Q)a&RBtFI`Zb_E_k3 zs|YkSqI-fT29%Wy$e{VI3>hSeLKlso1FB4}eH2$Vi9^(E>G;POV3Bg2=e8wFHwKOR w1$AYZAvxG_%kzS(qg!%)d8e~dS*Qm)I~t`;d;viJ+? v>$pHlu$PwS6<5!Cw8nn{%-9v+ diff --git a/compiler/frontend/builtins/jet/Annotation.kotlin_class b/compiler/frontend/builtins/jet/Annotation.kotlin_class index 4711375fb1629e8cc2e365ae3b5e56e02f11691e..d400db8e670a84cbf85e85f5dc57049af28437bd 100644 GIT binary patch literal 10 Rcmd-`lVCJr;bIbC0ssa_0Nelo literal 10 Rcmd-`Q(!P+;bIbC1ONtq0O9}u diff --git a/compiler/frontend/builtins/jet/Any.kotlin_class b/compiler/frontend/builtins/jet/Any.kotlin_class index 26522767ab1..ef6c918b55f 100644 --- a/compiler/frontend/builtins/jet/Any.kotlin_class +++ b/compiler/frontend/builtins/jet/Any.kotlin_class @@ -1,2 +1,2 @@ - R Æ0B - \ No newline at end of file +R Æ0B + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Array.kotlin_class b/compiler/frontend/builtins/jet/Array.kotlin_class index 647cceb3adffb4876ebf286195f1f92cd74f4c90..67f0538a5c72e1ec9689d56454e4fcbfba0946bb 100644 GIT binary patch literal 219 zcmZ9F!3x755JY1%+rb2}Qi@0qrSz1O^ytwaDD>zD=exR^god7WcXr+k$jjNFvx65i z>E8BUyi}c^Hx}{udqtTvn<-R_N;lpSuDlP9T+zY+3(Z#XE7ds$;lkrFy2gEd*n9PLWDPwn}2*&;jY5_3U4ahSNQtC zyXbQ(*^1j;#hIMWgAQRR`_{tvDtR?0{wCQ;ewW-!o+LMtKO}p}pOV+Vq&9ZA literal 1383 zcmZ{k%}#?r7)1q@Oeie_wj*(2bmdR2Ax*4`u6zWSJh0E@%=dN7F_YPl%Yl${Zva!> zT<_27(k}LmKQ?{UhqLAP!u%BD>6e_$&baY*s?CYrTnQ0gdS3nGs|;^5+-7*0;a!IJ zM_zlMJIPCNyU#e2)0teI+vGXwY!gmrK1ZFqj5^DfvTkC;3xy{|nw8c2ocW diff --git a/compiler/frontend/builtins/jet/ByteArray.kotlin_class b/compiler/frontend/builtins/jet/ByteArray.kotlin_class index 6de58db1613404dcb0d6aa1ac0ceded155953c2a..a649c48a69ac2c9dedd23bc6a07e08b21b831535 100644 GIT binary patch literal 133 zcmd;JlaMlE;bIbC3KHiy#%RE7#l^uOz$OI}VsQeIQc+?YYzAClac(4Wo+xgPV+sa5 kU`1?ETtG#9V77FW5|Ax`tO3jx1Z#$<=YVKt18ZOb07U!@h5!Hn literal 133 zcmd;JQ?NB+;bIbC3=-!!#%RE7#l^uOz$OI}VsZkJl2KwDYzAClac(4W-Y9O4V+sa5 kU`4D^TtG#9V76405|Ax`tO3jx1Z(C6t6_&|W&?AW09YmrrT_o{ diff --git a/compiler/frontend/builtins/jet/ByteIterator.kotlin_class b/compiler/frontend/builtins/jet/ByteIterator.kotlin_class index 9e3325f06cf..cddee191648 100644 --- a/compiler/frontend/builtins/jet/ByteIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/ByteIterator.kotlin_class @@ -1,8 +1,8 @@ -& >2 - - R Æ0B -Z +&2 + + R Æ0B +Z 0B - Z + Z &0?B - \ No newline at end of file + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/ByteProgression.kotlin_class b/compiler/frontend/builtins/jet/ByteProgression.kotlin_class index 7dd8b10c4096e8431ceef919cd51f6777bf2ac16..7c90b10e6675050c81136b8ad4e5401f68614243 100644 GIT binary patch literal 118 zcmd;JlaMju;bIby6=D-&0n$7{`W(j?4VbOCI2Z(+q`*R8wlfmj1dS literal 118 zcmd;JQ*bci;bIby7Ge`(0n)rd`W(j?4VbOCI2Z(+q`*R8wlfmj1ag5P`*@}yULBL50tOU$@ q9AXA;U~zXOan2}ij%x}A&R|765RMC&!xF^>)WHX4OG6}_AgTZWw-7D> literal 146 zcmd;JQ_wf!;bIby6=D-&0n)r+o-~Z-!5E~>ag5P`*@}yULBL50tOU$VQ1>Rio>cX%0+XSx@JWFtw z;LDL0!ShLTrOwa)IvYipy>jZZRo+o&d z;O)eV;CZLHQs?`BosB0S-Rjx?(ap^`-T0l+t(onQZtF0st}k_lCd@EfXKHGPBD{G( zgU6|XwAoEuPGFa4L(UT*XG?OnBxg% diff --git a/compiler/frontend/builtins/jet/CharArray.kotlin_class b/compiler/frontend/builtins/jet/CharArray.kotlin_class index b5c7e1fe3a14e0b22a754aa4625daee41fe97eca..5697327d4b311806a79682f1ad963e3b926fe2b2 100644 GIT binary patch literal 133 zcmd;JlTa{X;bIbC3KHiy#%RE7#l^uOz$OI}VsQeI3Q=MlYzAClac(4W{wQvaV+sa5 kU`1?ETtG#9V76kE5|Ax`tO3jx1Z(C8tKooXW&?9r08FC{o&W#< literal 133 zcmd;JQ}8lk;bIbC3=-!!#%RE7#l^uOz$OI}VsZkJ@=;vV+sa5 kU`4D^TtG#9V75Y(5|Ax`tO3jx1Z#$ag5P`*@}yULBL50tOU$)WHX4D?%ikAgTZd_z+6~ literal 146 zcmd;JQ!p^%;bIby6=D-&0n&V6o-~Z-!5E~>ag5P`*@}yULBL50tOU$@ q9AXA;U~zXOagHc%j%x}A&R|7+5RMC&!xY5@)WHX4D?lWiAgTZtMi5^B diff --git a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class index 6fe17e41a23..412b9e2cb4c 100644 --- a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class @@ -1,4 +1,4 @@ -† N2 -R Â0B -"Z Æ 0IB - \ No newline at end of file +†#2 +R Â0B +#Z Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/CharSequence.kotlin_class b/compiler/frontend/builtins/jet/CharSequence.kotlin_class index 582048817fe7836c1e4bf7e79cf83ce0bc2dfd7b..41321a1ac0c3a203f391fea7d30c2d34563241d1 100644 GIT binary patch literal 59 zcmd-`lTa~Y;bIbCiW1{cGvKn~;$RTqmI8^eIDtt1C~l5t3I+jS4oeglP*EV5tqK6c CjRxQV literal 59 zcmd-`Q}8!p;bIbCj1uEeGvKn~;$RTqmI8?|Ie|#NC~l5t3I+jS4pS5tP*EV5tqcIp C6$c9d diff --git a/compiler/frontend/builtins/jet/Collection.kotlin_class b/compiler/frontend/builtins/jet/Collection.kotlin_class index 6bbb098a3fc210f6888876d10f1496024953720d..61449d2596739ede4f35e3d73733b535b68f3932 100644 GIT binary patch literal 230 zcmYk1u@1s83`FZT1QS(JR8=U-R51k9sp^=q17CntaGCl4Pr#0X$`nWU?tI3NkE6xP zJq8%Hsa@@1w)|c@?6gq`u9_A9Z{#sf_tY}GhC(i)oM>R>nR-@ULA)`0b5g8exJlCY0dGgw#W(kkMm?{y+fSnwfs&Vy*3KLHLK$Pg$7K^HFwNDLM1m*kRmJ3+_Ulu;!VX{vMOPipgQ+F u+f6uq>>wd@AzBh*FN8XhC}SEs?sNL}T=snCo$uf{OL>D(8^fPhE`TqE&l9Bp diff --git a/compiler/frontend/builtins/jet/Comparable.kotlin_class b/compiler/frontend/builtins/jet/Comparable.kotlin_class index 21e071233565c961af49ff77ae55a3f251d8c6fd..cd90405868a7e5aea7bbbb9544bbb15c16423ff2 100644 GIT binary patch literal 52 zcmd-`li<_h<6sbARbbF!<6;tEl3+Aq0nt$s9BKxNRy;sCQ7JYq77j)M1}BgV3jl9N B1J(cl literal 52 zcmd-`Q&7<2<6sbARbbF!<6;tElwdSs0nt$s9BKxNRy;sCQ7JYq77j)M1}BgV699Ax B1MC0* diff --git a/compiler/frontend/builtins/jet/Double.kotlin_class b/compiler/frontend/builtins/jet/Double.kotlin_class index 53c076c5641282c86d8e70f9b52a62a1afa9c9c6..34f9c8fdb66a513da9bea58d800ebdef8c793d92 100644 GIT binary patch literal 1359 zcmZ|O%}&Bl5I|wUrn%NCmlAIpcdq$;wB;c4k^~$mDLw@IlC#NeN{e z_eHggH~V^gy=}@y-o@YR@VDqLfAr0eLfJj^Rk(@7C$vI=x$`ck48Ncb)bRp!1$|-jmLI(s@rh p?@6EUDgUnzeFo}5=1-khIv=KIL;R@oTD{k~(D_T}M(1yxH~)<0b-Vxo literal 1359 zcmZ|O%WA?<5P;z(mT-vC#DGD%Qo88HT7uAvX;*y&mw8~HtC^WZei_b2#!r!dh8VK# z`L9&p1$q>auS z(%DRBGo8(JHq)nOx#7F(TD@ZLTc>yH^lqKzAFk8>0d(Gz&U?~%Pde{O q=RN7uJ>~!Psn5Wom-$QQrOw~uvmt)cxl-?RPIdm#d8PBO&hQQ1GYzAClac(4W{wQvaV+sa5 kU`4D^TtG#9V75k-5|Ax`tO3jx1Z(C8t6_&|W&?AW0C7qT<^TWy diff --git a/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class b/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class index ca4166e7a82..3c5453521ca 100644 --- a/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class @@ -1,8 +1,8 @@ -& ^2 - -R Æ0B -(Z +&*2 + +R Æ0B +*Z 0B -Z +Z &0_B - \ No newline at end of file + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class b/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class index 923c15dad8c2acbf900fccd1157dbceeebcff59f..1652bce93c9c21a4f3f40f3d6a64475742c48cbe 100644 GIT binary patch literal 118 zcmd;Jlh8Ke;bIby6=D-&0n!3N`W(j?4VbOCI2Z(+q`*R8wlfmj1;Ta$$!bS&b6is} Za0YV(ARHGchl@kZfDg>pf=D<)Bmn2L4iW$W literal 118 zcmd;JQ%Er4;bIby7Ge`(0n+?I`W(j?4VbOCI2Z(+q`*R8wlfmj1;Ta$$!bP%b6is} Za0YYuAsiPdhl@kZfDg>pfJit&Bme+f4nhC` diff --git a/compiler/frontend/builtins/jet/DoubleRange.kotlin_class b/compiler/frontend/builtins/jet/DoubleRange.kotlin_class index 54dfef94aeac6aba114e8c594ac5eefce39a63c7..e48ab9c02304ee55b3e7f1d90e0474b353868344 100644 GIT binary patch literal 146 zcmd;JlMplF;bIby6Jir$0n!3so-B;#!5E~>ag5P`*@}yULBL50tOU$ag5P`*@}yULBL50tOU$Rbaqu#Rb%uECo`i c3TCH(*(^?IMn!RPuo)yffz^T8DPT4W0K!WPWdHyG literal 125 zcmd;3Q%KSh;b0I5(cRbaqu#Rb%uECo`i c3}&Z**-TDoMn!RPuo)yffz^T8DPT4e0Nis6lK=n! diff --git a/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class index e975eb46a2cfcc6da665cd31234ec946f98d89e4..3dd41e97be1dafe46c7820456d8e545fb1cba5de 100644 GIT binary patch literal 64 zcmd-`lhD)R<6sbARbbF!<6;tEl3)b#83oc57-4)P7La(92!|R_gas(aV36(vVKD*# Dtq%nr literal 64 zcmd-`Q%Kd~<6sbARbbF!<6;tElwbt%83oc57-4)P7La(92!|R_gas(aV36(vVKD*# DyR`*c diff --git a/compiler/frontend/builtins/jet/ExtensionFunction1.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction1.kotlin_class index b2c123f886267ffd631f6c46c75e5fd5fcdc2c56..7d0df048d621fb3cb528f839a03de483b6cf6d9b 100644 GIT binary patch literal 94 zcmd-`lhD`V<6sbARbbF!<6;tEl3)b#83i&?_)G$63XCv$BNmXlC?yUxpa=_4ErUV2 R6%WviEGY<|(FsB`0RVC$2Y>(o literal 94 zcmd-`Q^?Tb<6sbARbbF!<6;tElwbt%83i&?_)G$63XCv$BNmXlC?yUxpa=_4ErUV2 R6%WviEGY<|(FsB`0RV_;2fY9Q diff --git a/compiler/frontend/builtins/jet/ExtensionFunction10.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction10.kotlin_class index b5b3fa9fec2e8b529755c137e128f68886816663..1a41836a3772f3f1396af72c8a46898b7211a4da 100644 GIT binary patch literal 365 zcmY+(OsS(amcj;W;RG9Di%!^KE1Y5{oMA8QaS+aN6b?8E7icT}@159R_xz*%I8HXk vt7b7B#8azLZ%sP04C%s3NLQ96-B^xvXQiYED0^kS8yH!Doqis}pQ(;h(p diff --git a/compiler/frontend/builtins/jet/ExtensionFunction11.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction11.kotlin_class index a733cc526237c64e43db58d712f74301eaa7db6d..9825bc37af3b13ccf3a53c3117765ee92c83c27d 100644 GIT binary patch literal 396 zcmY+X0%bG9XezLXY7Au(aIwwe&__(ed#NUifv?zioC7^u3o9aBSuyFxN=SE>B|TUv>B(|+$A5V%W;Sk5 F+s0;f4ADLgr_vKB(Y}}s8 EzxbCR_W%F@ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class index d2c573b1e182472ef6bd4bda48198a4d1cf1374c..10eb52fbf1e5c878f8e96c8d8547fa0c0476bd37 100644 GIT binary patch literal 428 zcmY+h6$tLd*)WrdlqtVgz2DSXS)|4R zFLw$ZN|2eb7BFR&FlTmQ!K`4(?7@mz!E;s zW>)TnHbS>D;8fVgxv+x^VTDU!7gxd_u7!Qv2y5I52e=asaW5Ruhjz6)C$C4+kj=EcwX+PJ> z0yndAFO(otVJu+GEMdxQ!;IO1IkO83W)GIkKCGA(teFGYFo&>Zj^N&KOU3XMEJ)zp z47AcvW};r$bN)+*U!giCa?D(-J1Syx!=znVpmrpQ+LLV5f#jf$Bo}oed8jkVM_ot? cbtMI;8!0Rj)8!$E5%N_tMt*80gQ~Lr0fV6?761SM literal 461 zcmY+=ITC_E5Cu>M1{k)nL(7QBfXFf=^cWrhOUr#M;Z^er;2 zEO1jR^FkX$yR?8Yvkg;b2WHF?=FBcEm_1lB`>e8|AUNVbZBAP&<;1+LIjAfh18!l8ZW#Jk*)wqb?+c cx{?CajTGjI>GBZ72>GfRBfmA1K~-7*0TDzdU;qFB diff --git a/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class index 63323c4309926423f4b4b9755c8034dc5561c32a..6c39d9202e556a30eb7da6fdfc789e766762cc24 100644 GIT binary patch literal 492 zcmY+=IS#@=429uLNWzfym57RpA{9bZDLDoQ0D;)|RUi-u?#N*n97n?C_g8+_y=ps+ zwFS3srJirYt}0`Nfv}B{a0z2!2NPizQ(+G?;WFmJ8VlhHmcl+(!T~OSPIQQy5+TAv zh8VB^5bFfJx+*5OoZs~BN9l%1j@fTD`&nrIGOXoRq&3SXZCEAJmgSIkESI!rd87lY kOggeO>BOp#&MZHR%q>^N42buFA@Nx-BEAd8oqR#^1&ehk)c^nh literal 493 zcmY+=Hx9y35Jgdc$B%J%C8BagL4_zOSq2L*0+DkR2t?W=i@}V?lBYbknm0O4UaA>s z15RQzUEhSN{jD$%HZc;mFc!8k5q2;Yb}?e9atXe i$kL<}t3o=n{7#tNa#hSK@m??>J`0A#Pr<00FNl97S1BL> diff --git a/compiler/frontend/builtins/jet/ExtensionFunction15.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction15.kotlin_class index 7a95ed8daa0287e6136ce0cfd3a12b3a116b8ca3..8a55a2461568b48f060af17eb2bf9d308dd2401a 100644 GIT binary patch literal 524 zcmY+=yAA?KC1YRIm86A}v@hY01ivRxFRSX8EKI rD2|4JNwovN>{NotgDi!XAdgK1RX;#=;>c!WvWIJZ8cXzJv?-dvm5^ zY?TNJ_A;b6%8=nK18{v0sV<^jR(6z{_Z+8nSNhW=&n)CrJB`>Z*ZX)`k>)Iyv|!~( z-z<;x!}3YLtbnv+g`^crlh&*}X~T*diMi!pF$=_>( literal 557 zcmY+=xo*Nx5QSl1XuK%jELWcF>!C05RZl_@obn8uZHN|{%igN DWuGp% diff --git a/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class index 2bb8425845e36ebfc60ee777c3506d3becdc2f75..d0f84dbaa62d414f2a937015c5be2a8e4f14c07b 100644 GIT binary patch literal 588 zcmY+=Ic@?$5QX9CW@c!HSsp})h=_m)kys-1F?;|J$Yx&+2+Ni&BO?$#F-=h|QQ`MT zRnK%PPmR=g2x?v5LWE&sOG%R!sEO}?GXYj)eQow8rOTao50 zOHRT ztol)PrY(4tRr`?*b0uKm9UQs;Q*Jy8dt(0u7xAq2*-FEIoAo^ zl?W*|GGy4vkmFMZ;9G_QzvGbU60=H~l_qY#)=6vYqb|AKWY+P#NxCUd4+ksKEz2g| zu^iGp%OyRqJkle}Cq1zO(lbkwURWXNl@&Eq25XSL7M|V3~U%qA|v$C?V5-YLv7#_f6WbSu!2_b}#k(rRp<2p*6L@j^+ zRn=z(wN5iN9)h~p3?mI)Q`QPs!W!4Y1>6YxxD^g?CmiBlxQGW~gGb>Ko`fSj3zsoI zb7o>pl?VyuGNf3_kYOzY@FPQxUl}Ucorly^F{mpyTiZX**ZH*1nGokmbxk+$F_R@L)usPfec9bp?i;S8RH9Xt!WcoFvSDx5`MSYsfZ!%*1ANH~wL zJI6Y}w-O=5uM81ZGQ`-(0PJKa;2=X0|Mwx%CA1P{W_xt5^EJ=5uB6FHH?(T)dXR40 zeYjbX#w?rk#>$Z1Sq|xg<&q{Wk2GavNi&uv%~?6pC(Eyg=`9Pz%oBeM1LD#!B(4o3 W;?^)G?hQfwGb|8KhQ-G1`_cuMgER2} diff --git a/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class index 9b0864a8a2540dd4ce31daf72bffdb077b004441..bf66c1c6f6ec28a8950945a6353d395dbc293422 100644 GIT binary patch literal 652 zcmY+=yG{a86ouhAhne9p%w=&Y2o;qDm9dl3$KU}l8s+8%6^urs(P$tTjlO}e>2b4n z!Y;qRT3K$;+VAErK-3AkabjUx#@paX+2TaGgj3}ZL*)n~ST3mO9k1)}fA19UA!F4!LV$&@uAkUiklK|JS-5pF)3X zuzT1`{n^LujScC7Wl5K;5^2T?Nms0hbj^xMH>@&g&T^y$t3tYECB4jVxi`!z@llu( gpM@FmRhSdsg#~dX1o1;yBYp|%#2;bfU~@+E52ZLZi2wiq literal 653 zcmY+=xlY4S6og@4$98TUFO#J}RIVseA~TnL;fS2#nB2zg zf=i#_-ciW$$f3Y9hZ3(GfOifZd~oREi$f37#ZdS@MwPQ4*P_{<8-Jl+sZ&&+8mw*( zv-<4u^4v~zq6$T)s)p!H6^YJOvFJjTh%Qx4(Ur=Ju2n73jVc}H^_DxQYzrTZnefS& e3txURlcnlu^196@w0?}wR7>q`vi9UzV=e4Lx zsO9&sPL3P4H@mqD5OsoXoLJbl@irJKTkI&8u&W$mPdUQAa*PAzG7gm;j+84nR!(rD zT*Y+7g-da3RLF3zLykus3e0r?7CO}MszV*`IyCU9LlfVtA$KhdJ4TM(2>%b>`n7J| zr_jF~^tSt{e}BBTv>~0cEa{9@BAv5B(giCbU9w`*6{}3TW;xOgt3sNvl78m5%nY+i nyc4Fx2Vq8h66VBbVL^Nmg7_w^5kG`=;+L>N{1G+>%WqnL=d(F` literal 685 zcmY+=$w~uJ6olcvo$k&}r-#Y};wmc_S&7RmeT+OnL~))+6h%=KMNt&>Ieb1lC+9$F z`TeV+{J8(^289n0_k%%_hH!HeJFJpJtdnclAV=6F$Jin#*e2JpL-yDuH?T)eu}^N| za>k|4aP27MxaCmboq7G62D@y?-xPYzxD%!b1EFz!1$b}5=1Jo*d$LY1QG zthU8vGwUTwK@%BJwf mmo3SPQFt&wX#*XmU*j=7})B6X}wK>cH diff --git a/compiler/frontend/builtins/jet/ExtensionFunction21.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction21.kotlin_class index 176efaa6dfd9bda4356699ba5f3fb27e953e475c..61552114a8a2c280dfb9912019b1ea7dc6c8f7c1 100644 GIT binary patch literal 716 zcmY+>$w~uJ5QX8sH{G3^P7fy|!Bti+vJ#iUm5<>AM3lsN9#9m;V2CJ+f}&63dwH!? zL2CK^tKyU!bXIz~3lMdKUYuCij`23wP_`H?ALD$IA%i;gx zYrobl`V{)vgQfL;>ff=sFtZ^YvMlL{RU#d;LedE%$w~uJ5QX8so$k&}r-zdfan&mqS&7RmeT+OnL~))+6h%=Yia}9udK%x$PURNl zEWdwMoU+5>+w?N)AuPOJ6#Fo96C13OeXNr!*dPbkB!}1{N7yD;u|u}lCD*V=jk`}q`2jf;hsZ|5eMLjLjx}ynt0{V!aIjHJ~?#oGaEA7#jr5C^inWceDLSn zg)#-@?B3!^KPlg_Hb1oy9XR=-L#K-9$SDvVJB6YXr$}__R27{$S<$&uO?2TD_tWy0 vE8|!f-Y65{oiY_ZC^O-sG8aB8Asj0k!Z&48_@QhGzm#p^ud=f|ovQl}gho8Z diff --git a/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class index 3b05f4824ec7c093ee70a6b94bff1fcde74fa18f..f6d1c9bf301ca6ff7427242f7111ecfde5bdb961 100644 GIT binary patch literal 748 zcmY+>$w~uJ5QX8sH{G3^P7fz@aFvydti)x&jgR32L=@+FL{XH8q9}@jqUbaEKwc|V zkXnBKs;J|J-MN150z|!_A14;JYrGAXlr2`2OITG7v8EhhT{*^vav7V-4qM6<^L+&~l_KduK zHvFGp;n%uppF+PwFta#F{XWZ6V;j;g%aZn3CDJ}CBpt9K(jhA*9kI%!W0oVGuqvce zRx-%^E$4<=C0+_s; E1C=*FbpQYW literal 749 zcmY+>%Syvg6ouiOG)Yg>CRx3Uql_GMBn~_DF?@iE;{AR_Q51`!D2jsO?U{Ta)7`V7 zYxw=6&0cnpf16%vJ%qW}i((&UYGi{YvX2#V39IA)Yvd5?*s>e z1Pgz@ohedK?BLBV_G`sH%hO{U(XNv(+H)$2_MHOJfm0|tbc#erPG!-tlNFsfRYa#w zaX%?;IX8|~;ia-ByjCW{p)wWTDKp`N62d2CUHGDG2;Y=V;fJy%{8F}szsk=1_;cNV DoOVCR diff --git a/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class index 63d81610d4353cea7d73d2fa19f8e8522dfe08a7..57a324f09ad93b76779622da4f0a0bb7d1140f64 100644 GIT binary patch literal 154 zcmd-`ld#j`<6sbARbbF!<6;tEl3)b#83i&?_)G#hD12stTogWwK$-$0OurEe$ebuU m4mF?%3(zbEgLEq%pdDFK5I!TAR|@4Zfq7+692Pm{$trF@bqyP#!awR}ST|I6-u<0sx1L4(|W} literal 185 zcmd-`Q&_^N#mB)Qz^cHY#m2=Xz$gLYGYVv)@RNapgd+UuN=x_af0Yz1pw1S4^{vG diff --git a/compiler/frontend/builtins/jet/ExtensionFunction5.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction5.kotlin_class index 63d2d0e8f4169c4b05bd2217240b7d1beb854cf8..bf1242714f713eadd55c38b6c6bbcf2b8546f7c5 100644 GIT binary patch literal 214 zcmd-`lW@@D<6sbARbbF!<6;tEl3)b#83i&?_)G#hD12stTogWwKpqO8RUjXQ&nA$j zzz8$nhy`R%R1}9AP=p0&7lT2%6%Wu2SyB)_BbZkTo-HHe3rYtE4pApO}h4PrdyfP?{8O$q(@>syU S3Mh{i%&Ua**qk7yu>%0K)f4Xk literal 245 zcmd-`Q&`5R#mB)Qz^cHY#m2=Xz$gLYGYVv)@R7=aZ0 diff --git a/compiler/frontend/builtins/jet/ExtensionFunction7.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction7.kotlin_class index a5597191ab8a8635fde979e59acf423864f106e5..02f46bdc59aef131898cefb92c8b7ce6de8ad920 100644 GIT binary patch literal 274 zcmY+;yAFat5QX90Wp|kvVoph{s4S?Ar6rHS13)CGP>7eOcO8ae%5RD}KXqkO@5vxk zrj9!YSK4HYtFptWoZ+VIaaRs_C`U}nIc8--SJ`d`iLUyE6SVoH~j!T)E0FB literal 275 zcmY+;yAHxI429u1O;QUXbVkIKiJ?=)$jD>x07W3K1Lg8UeN9r=3?4rZK0kMPpk~1i zF}o(sJZL$Za5VNf8&|j(2V9LKZpI0B;~EcRMwjWozX@ZL!**U8Ppio! bdaAsrS5=~yDu~{yDEg?9=&P!C({KI(tU?yq diff --git a/compiler/frontend/builtins/jet/ExtensionFunction8.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction8.kotlin_class index 3cfae0e5acc70e96a83df18fdcc6eaeb1065ea49..1ebac978e7acec351edea65d9c106dd3d6a1ad03 100644 GIT binary patch literal 305 zcmY+;I}XAy5QJf`V>=s!(3BBXDvDHyk`ivg0fIohCEhIu$845j%WsdeE}l382|tP literal 306 zcmY+;I}XAy5QJf`V>=E)Xi7xoDn%+pNy#xdKoE$xM0m9vhGXJvmSW3qn)zd!zSK;j zflsChBMX}LCTx{0_R0kg$___mkCSr1S-HeTIpV5Zp-uGfS-8Gy{h?Ur$>lgR-z>*D jdN&(PteeQPI#I#8iyZ4A@~o#QuwJ5)^%lj|@KpT(oWdDn diff --git a/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class index 920fb4a8e1aef629ffe39c33a481090f256bd315..2d965e0538d7c5d053d3bab627094fb236537191 100644 GIT binary patch literal 335 zcmY+#wDvDHyk`l2B77zr20Ezgs3RaAn48@e^HFGC4<*FVB z1y`xsM*~ypWR0z`!CpASLD-@db~p-qoP=|ng#$X_0=;lVQ|W)--2OV(A04J?vME;0 qHj7buVmBGANf(wOU0E6F#+l3^!8mjTj z3zEG~$x_MS_1Y({lB+=cuRdzZ*~eGsxK| zIr}7MpXBV5oPCndeWw5JL+(I5r1?|kmCOg3z0Akyo}`^#=0f5JsCQVTsYK0T=023xaK}B?$d7?NuM4mwDhmm)V&_jtqMfCMUykzK@M7 z9(JdBnft}58lF{CH1W;k53Xn*yVBkH&3zLL0hDx-Euovu!2`Twe}f zo{{WjOcqlfkn)g7NzRnyOi9j^~W>Px8q#c6&s( z$AmLEoyqA;PG@pDlhc`ea*o};8P6a$ms~w9SI>>vS5LdIo|dbpJx4ut|J``%pFz$( z$=N44`y^+dNEa#A94qleVjjKUdj9=b1n0EyeDy|lQ|duE%RFDADNpA8i;q1 diff --git a/compiler/frontend/builtins/jet/FloatArray.kotlin_class b/compiler/frontend/builtins/jet/FloatArray.kotlin_class index 41221e29c767e2461e1e3d46a9ef9169a8b588b0..d914e488bb33a04cf65d179a63eaaaf7f3d7cec1 100644 GIT binary patch literal 133 zcmd;JlW;X+;bIbC3KHiy#%RE7#l^uOz$OI}VsQeIu2EtfYzAClac(4W!6ag5P`*@}yULBL50tOU$ag5P`*@}yULBL50tOU$#m2=Xz$n3J!~&wDcsSGy(w*42SU4C37yxUO1Ze;O diff --git a/compiler/frontend/builtins/jet/Function1.kotlin_class b/compiler/frontend/builtins/jet/Function1.kotlin_class index 41067912ac246b3a30aec3155a01ff3cd413558f..53de6d941c6cce788ddcf3e424eb788e9e208525 100644 GIT binary patch literal 70 zcmd-`lVH{2<6scTRAA6z<6;tEl3)b#83oc57-4)P7La(96o;BYx)l#lZI%=p7Yk4g JgA;^i1OVos1{VMT literal 70 zcmd-`Q{dF%<6scTRAA6z<6;tElwbt%83oc57-4)P7La(96o;BYx)l#lZI%=p7Yk4g JgA;^i1OVw(1|R?c diff --git a/compiler/frontend/builtins/jet/Function10.kotlin_class b/compiler/frontend/builtins/jet/Function10.kotlin_class index 5b6baa04f3a9159255dee31665a7cf0d7be8c6a3..19a7dec2fb0d1e4e037b71c46142f5078182e727 100644 GIT binary patch literal 341 zcmY+;IS#@w5Cu?=<2a6m&@UsZR1~QYB_$bt zG(K9`ijoOSWs8+^hPAT8Mmfh;*<+_%V6Pl-P%d#)j%aK8|Ay}SoW3da2eVNpCco(W p=$f=)okYYsi!AFR%2-#CW8FkK>n`%Fhp1pZMS=Aam6P8hegQyz9X9{~ diff --git a/compiler/frontend/builtins/jet/Function11.kotlin_class b/compiler/frontend/builtins/jet/Function11.kotlin_class index 145a5cec29a467138f07a694eb0a520a61f7fb2d..bc392a34e28285afecdc469f3116ed2ad18766f9 100644 GIT binary patch literal 372 zcmY+fbvs-|q2Sxn6%# zx5CVy4w4?*3=gt>Bvg>r;EZ>klSn ztDc$ltT**Uz&ePCbrglHlPF@HMTT_|#jLByvTmY;br(6-LzI^7y5&VeKl(*wUkJM& A*#H0l diff --git a/compiler/frontend/builtins/jet/Function12.kotlin_class b/compiler/frontend/builtins/jet/Function12.kotlin_class index 29276f6b797cdc5bb143c65ea985a54cc93ba192..683a39de2331b49e9e15f714351d7cb60035794d 100644 GIT binary patch literal 404 zcmY+uDP4vOz-WBGpV8=!EL@*34hd6!r#inW(hp>b zad474nYJ!Mr!wG7*u}Z9hYMkaOJN^Z!W!4Y0d9m1ZiPeK30r(L+%^%upfMyS#v+9} zV4$jy(HBgwKhEQ_ZrasWl~oRD&jQkc<&uspk91-w(wXIxE-X#DvI5eLWk`2cn77I= OPheW&yJj@}e~f=Q$|8jT diff --git a/compiler/frontend/builtins/jet/Function13.kotlin_class b/compiler/frontend/builtins/jet/Function13.kotlin_class index fcbd3cf6471e97820b619bca8708e24a88e56af7..a1fbca875451e94febecdc0cc7d449249faa88fa 100644 GIT binary patch literal 436 zcmY+&hV;33!$!>c|t zbOL22s-mv?l?^^Zw>!fkwz=b$Zs52=*T}T>r XC51&|zuX1UAfFW@ToMTg^=!;seAG;j2D0 zbc}fdRZ-6^%LZT2o$fG;irjHq8Mnx^NLv<=b}XB;XE~$;%OxFI9_hqVq%+GWU09lQ XWd&JWe7OVD5T6x8;=5wh|6h)O#E2z1 diff --git a/compiler/frontend/builtins/jet/Function14.kotlin_class b/compiler/frontend/builtins/jet/Function14.kotlin_class index 5a5f192e16068a928897fd090b28f2e860a9a143..059c93dbfc8c02e0b843873894ad97cb51fa05c1 100644 GIT binary patch literal 468 zcmY+05%OI!ZvP9+7xU{UmH+?% literal 469 zcmY+ diff --git a/compiler/frontend/builtins/jet/Function15.kotlin_class b/compiler/frontend/builtins/jet/Function15.kotlin_class index 3d192712111935845c2e0a33b690d04b0d24b061..35122e6a08b4cafa9293861a75126ecffcb842fa 100644 GIT binary patch literal 500 zcmY+=yAA><698#vh`EYgCdNK2MYTCsAZHOnDwSb5Tx o<&t(RkF;lL(t+jIqwJQGVg|&EVS#uv42ciJi1;#$8^1xx2P(ZPTL1t6 literal 501 zcmY+=OAf(M6vpx1s=BQ{zM&X(WYCcq8d`=05aRuQh7dy7juqL6I?hd;;qN~>-_fn) zrP4@S=pIS*$7m(WY_2)q?ajB+m1?^lWDn_}<42e&}sPP*Ve*o+MD!Bjv diff --git a/compiler/frontend/builtins/jet/Function16.kotlin_class b/compiler/frontend/builtins/jet/Function16.kotlin_class index e6954406199e3be66b5ca2653f68a0bc05bf8d9f..98e29ab70bffff1812637b5b7d7597cdd4f04539 100644 GIT binary patch literal 532 zcmY+=yAAIzWOaF literal 533 zcmY+=OAY~15QX8st+lK5;|#^9M+Qb>XlNN0K#2GI8A1pl?8d^ZKr3|)BBGuN6ANHoC$o^n@Msh0_=ayBG>*FcQ`n3uiGA_OSbNq;ohZ5qz9v z2yl@h#7%|>kN*&Apb;xGLdE%xQGY94EH|ruvQWF=dQP&8MVhh{X~wcib5@G9U^%2E vD@|IlT+*7AA#GTiv}I+hL2}DpF+JkZFh@Ka`oybYK)f4<#HV3Y`~8Oxiy$q9 diff --git a/compiler/frontend/builtins/jet/Function17.kotlin_class b/compiler/frontend/builtins/jet/Function17.kotlin_class index 254c89761df1ed19c32ae8b4d1c4769d9533674f..99908e1f96500062b1e245c4757ffeb500871e14 100644 GIT binary patch literal 564 zcmY+=xo*Nx5QSmi>+RZjIqs}fu2N7%lrHlIv^)R^L?D6e31W$ef)WvhC&oggIGhCsh7?~iWcZdL$6f~D?>uCtK)+IUm5z5>r?=MT@@h~g&19pCAoiN69MS_zkseu^ z^u%&W&n%Dh!tzP4tbp{!3Q6xQLt3z+I&E%QDP~Okuxt@OEfeC-G9~_4X2f61oOrOr I_5ZuY5ixczegFUf literal 565 zcmY+=xo*Nx5QSl1N}lrj ztC^##{HTglTNvh6;e|HTMPr3qVH+`$a69_^t+5i9m diff --git a/compiler/frontend/builtins/jet/Function18.kotlin_class b/compiler/frontend/builtins/jet/Function18.kotlin_class index 7652b7570f713cfc2dd3f93cd528c0a17058cd12..26ce4b3e572b8084d85ef489a5d4a92b6c92c2f1 100644 GIT binary patch literal 596 zcmY+=y-or_6o%oQ*=3j=_UD6YW3?3pm9eDc5-hy{3`G0~Q85|~1S3H(a=)&JGYO}B z-s+ss_KVX_W&;e$pkthdE>vZO3t^3saEMFc2v@>2TniiA2-k5dY;h+X<6hX|^}xAp z;9ZH3U@k+7r3@LqWXQ3W0ocmW#P4CqYzzHT`I%0l|GCaK+P06+yGga-@W{BR+AbiC zS&B4aY0?8LBu!Zn>5)|koY4GFt!u literal 597 zcmY+=%T5A85QX9Crs?S!=5k;~Sk21Ctc**RK86nfk)YfZ@fM9n1JQ^WeHS0kp{!1( zmfydsI&M(>sxor{PK%(lv4-mItuPkWI1_H*T-abD+{9GaVkR77F6^)nj&LCyo95I3GF@!c~c SZas72mnVonp6%oR?>m29Br>)D diff --git a/compiler/frontend/builtins/jet/Function19.kotlin_class b/compiler/frontend/builtins/jet/Function19.kotlin_class index 6c14de8d0dc489b3530ec924e67f7c39358567de..50f6c6c23664d5b4d906879a79a54f53b605d3d9 100644 GIT binary patch literal 628 zcmY+=yG{a86ouhAhhaDjb6G$`tf(xgj3uS7VCMrsAb7$1H5!dZqrqr2+WD%E%e@nJ z`Tf<(3ZvfUpa>Br{b-P+9=_))JIstdwvB7pF^;ioT*sbqg1K=6`^EtW#!Va=r?_5n z8Ctk?CS>EcoFs|d!IL4821INZ5C&o>j8Yj44 zap7BdbS9*Dwjsl-4LROzC@{4F__U#onGGHMtcKioF({q>wiPY^+gXHuV{_O~t5f&Z z<0Pui45%}aqs~Pkbs?%zm!gQe64j||QB2*48q}@GQ+J|fKdZJpIAKCQDO===G9}-X a897nr}>y^(ftDy{56^Y diff --git a/compiler/frontend/builtins/jet/Function2.kotlin_class b/compiler/frontend/builtins/jet/Function2.kotlin_class index 4ac0e9f25975094a7443f85afa90068cfe5ccffe..500d532cd4d66fa57d29ec6515ebb0dba587f028 100644 GIT binary patch literal 100 zcmd-`lL*n`<6scTRAA6z<6;tEl3)b#83l4s_)G$63XCv$BNmXlC=CuZgLEq%px!Jg UHZB&R9tJS46v|_Cf`~E!0OSz})c^nh literal 101 zcmd-`Q`p6*#mB)Qkg33+#m2=Xz$gLYGYaIO@R~Nj-euRd!f2_Ei9CaY_)S;+G9f@M4YhHt!$CE i%8a~M=H#QYAfJ^b`Kko@u56Q^$`1Lh>@NL()B6QHK{zk~ literal 661 zcmY+=NlF7z6ouh>l}hEMQq4&-kc?{NAR}>@q04Xq5yifZ9g3nTilQhA$r{{%o3nDf z7jlQ+KRO&gDu3M|_W{<+U=SxE+``Nbo5mrwjBD67j<91~$F6aVJ>v%UjXe&Gn>aL1 za5d+`w{YW3NO5OFh6fvRJlRm-#RlNbhBiKI=-|tSE++FK_dSeCr$;VFvqM*ZLch4Q zHcYFRH~MiBRqqDWk;qZUqL4Zf)u^#3qE1D1>P!?<=b{F6A@bCvs5#84E!R$%khjVf jd9O^#M`cDnD|7NyS&;8ake|vn`K|1bQ)PGM|C`<)G3Gdl diff --git a/compiler/frontend/builtins/jet/Function21.kotlin_class b/compiler/frontend/builtins/jet/Function21.kotlin_class index 421499ac99d62e2f49b54cf9cb1de34b72e2368f..239b7e0294ba6ef6fe34f10f1127e1ffae94fddb 100644 GIT binary patch literal 692 zcmY+=xk>|J6vgrRCX>mR$t))u1glgQsl+m+4`Ja0Bq;9tilQh=L{St4MW4iXb3EP) zx#jO)9gZLM76-Wxu-p#@aS|fzxzY}+#v#^>D_A#QEF>N1`fqEQ+ZUQH?qkdFo75A7iz<-TstQK literal 693 zcmY+=$w~uJ6olcvolfVb(?ewfan&mqS&7RmeGDHUqBzeZilQirq9_WAzKFh?o$?&W zS$_YjC_gHH+#vS>mdaodCn4O_*bXbkAy$oRSTl~WZd}KPag0sl2DXenwvC(EF-~wc z;lj6Y;Y>(zWkZG=8*<#)P~gD^;K_zIUTo;#&4w;MZ0O-@GUUFGQR(#AxoG_G!f)tj zW*3KPb^G#koJ7^#0ktb~)Sf7$_C+=7Kon7jqB?aXim78!gE|p;>QvMmX4RH+Crrpo pWsAI4rsS$w~uJ5QX8sH=WK+r-ze~;3_K@S&7RmeF-5C5K)}x5k*lH#h@q(ilWcsL)jj0 zL2CK^tKyU!b?5t;3$WM=`cZ6QyQZ+gva-dBatW)-A=Z@3SXYj)pi|6HP{)%F4ZP^k#G4K+eCW`|*JQ|C2cw>msb|B# z$%jAIP0uV0lHw0bQ&Aii`v=sHm!WpOEVbuVqV~N)>cFc^9ePF7kynK}_HxvTS9OpU zx11Tzn7k0y$SYw&-Uw6jPMDEnVNN~@K|TxXNlF7z6ouh>l}hEMQq4(=II59@jKpDvF2e;RM2vmkpeTx>D2k$>C}tn-z(rX( zz6-g-?;l;xwf+3ZbW`hLn0wtY@?mBsHds;iF;XsJRXM<#avAH&AvTmN*i^RIQm$fK zIl}3bGh4&CQ6a{q4hgPxNO7w}hI<`=M;+>T)}et{9h!L8p@mN!+W4LhsqLVj8<~0` zm`uL(>)W~cK`$=;usj<^L9xF_?Kl}~*U6{$oJ!QbQ$QU!m8nCgkUDazP{&S|I&rG@ zlH!&#;~0?_!WwxcjL92eLf#2e@*$qCix|7kz-+d@qf9_ACka6 AeExD;}WPSyF6VEI>0Ez`Rl@j}go(gYuZbymBay*$JY91pt;E4a5Kd literal 161 zcmd-`Q`pa_#mB)Qkg33+#m2=Xz$gLYGYaIO@RD^%B4U literal 221 zcmd-`Q#i<|#mB)Qkg33+#m2=Xz$gLYGYaIO@R@-#Eo4|!jmyuz(i zl}imwu7fom!Um&ogh|+97LKt9J3NIG45dE)YPmt{#mR!mx1uKjN(8`C`%L;wH) literal 251 zcmd-`Q#iz^#mB)Qkg33+#m2=Xz$gLYGYaIO@R32LL(66{-LL diff --git a/compiler/frontend/builtins/jet/Function8.kotlin_class b/compiler/frontend/builtins/jet/Function8.kotlin_class index 6fd6d939693ba0cae76e6a1af7a611df72448d2a..ac1c2512cafe16fb8eaa4b6936175fb2b0d7ddd7 100644 GIT binary patch literal 280 zcmY+;yAFat5JutMWmzV~n7<@eR2Edm(vrt8p~Yxa(8LSq!?TV=_d8Scu2wzPA9>wh2nFReF+-6Fo7Rw4KC$*>+G b%X*3&>m^E9Z;@vWqLej?0_!8n>VJtQfIJt> literal 281 zcmY+;yAFat5JushWmzVKn7=euTUk&UOG+Pu2f%2&C*FNKUQ8IrV#=>Nhr85MJzE4$szOu|B$CHKAWIgL0 zxka+OZC(46U$IH~CheApyv#%`44jLfSfxZ=MKoZ19I+weA+=c v&`LlqME#?4r;RoJRA#Q+O0q7K1bQgk zojWAE-`1r|`5l^a*QD$ck(Y_cldl#Qol-FN&O~uEp;!oKj+52OWjEQA$2SB`b$pbqK`i2|K@mx(*OVf diff --git a/compiler/frontend/builtins/jet/IntArray.kotlin_class b/compiler/frontend/builtins/jet/IntArray.kotlin_class index 3418b23de144f4a566ad0b166a7ad1b37434f7dc..db0bda39dc8225b55854d74defbc79032a8455c6 100644 GIT binary patch literal 133 zcmd;JlZZEB;bIbC3KHiy#%RE7#l^uOz$OI}VsQeI@lj$NYzAClac(4WmMCtHV+sa5 iU`1?ETtG#9V0J>35|Ax`tO3jxMAFOw(aZ+czybh`Hw{Gq literal 134 zcmd;JQ#i$F#KOfSz!)UXag5P`*@}yUL4ZvPB*f$dA`PO%IM@uhz~bCU;!IK89LE$4 jc)*HSqqu;I_`qz#C?z0U09gZ=Er_I<9io{Htbqvts)-Fu diff --git a/compiler/frontend/builtins/jet/IntIterator.kotlin_class b/compiler/frontend/builtins/jet/IntIterator.kotlin_class index 31b70146234..03df0bc6d22 100644 --- a/compiler/frontend/builtins/jet/IntIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/IntIterator.kotlin_class @@ -1,7 +1,7 @@ -& Ë2 - -R Æ0B -1Z +&`2 + +R Æ0B +`Z 0B -Z &0ÌB - \ No newline at end of file +Z &0ÌB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/IntProgression.kotlin_class b/compiler/frontend/builtins/jet/IntProgression.kotlin_class index 197918f729b000f53503ed7352c27b46607aee10..11235ab9913f6c5a9aea4d980ad6636795c66898 100644 GIT binary patch literal 118 zcmd;JlSnk;;bIby6=D-&0n#i%`W(j?4VbOCI2Z(+q`*R8wlfmj1;Ta$$tFf|b6is} Za0YW&ARHGchl@kZfDg=0fJit&Bmn$14qyNP literal 119 zcmd;JQ#i|L#KXlTAT7iu!~&$5g7i6#F&Z#iad9vRI7xwpz-(tEwhM&q1d=t1;^w%f bVBieqFhMvjP!1P|m;oP{Z3vNYf=B=WA?*%l diff --git a/compiler/frontend/builtins/jet/IntRange.kotlin_class b/compiler/frontend/builtins/jet/IntRange.kotlin_class index b8388da00b0cb7a197a5c9decec3ce09d942a536..977c4be30c7243795f53df8e7ab70f98bc61a63f 100644 GIT binary patch literal 146 zcmd;JlVCIA;bIby6Jir$0n#jBo-B;#!5E~>ag5P`*@}yULBL50tOU$5RMC!!v)mA2WBTgB%B};0O&*z9{>OV literal 146 zcmd;JQ{Xk?;bIby6=D-&0n$uho-~Z-!5E~>ag5P`*@}yULBL50tOU$Hq)$ diff --git a/compiler/frontend/builtins/jet/IntRange.object.kotlin_class b/compiler/frontend/builtins/jet/IntRange.object.kotlin_class index 643cbc2d971..2d8347df9d0 100644 --- a/compiler/frontend/builtins/jet/IntRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/IntRange.object.kotlin_class @@ -1,4 +1,4 @@ -† Î2 -R Â0B -3Z Æ 0IB - \ No newline at end of file +†b2 +R Â0B +bZ Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Iterable.kotlin_class b/compiler/frontend/builtins/jet/Iterable.kotlin_class index c949e8791bb1025799b625d495b60d58e3b13db5..909005b4d096fbfadd7c06b14fefb040a104407c 100644 GIT binary patch literal 48 zcmd-`lTg><<6sbARbbR&<6;tEl3+Aq0nt$+9BKx9PJBQ%yAX#E8y5=)qW}W{V( literal 89 zcmd-`Q@F^e#mB)Qz^cHY#m2=Xz$gLYGYVv)@Rzq0BA-AZU6uP diff --git a/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class index 6f83f4899a51053ddad0d7b2f30f63740311bea0..97536060e961fc70d95a4cd62d0b759d9bdd619c 100644 GIT binary patch literal 322 zcmY+;u?~VT7)9Z>wB@HHE MR?9M0$11G;2ec^_ZvX%Q literal 323 zcmY+;I}XAy6hu)!$97&E35`-wx=u;Kk|H7Thcc^VMTCNprn{%RzO;|cI}gY$%%w)y z{%6BU9B~$RxQG+3;*6WP;4bd*5IdgY0WWdITRdWE_WwPs+xKzusnoQc2bQrSt79cr OW))V?a@N4Atnmv$RTbX= diff --git a/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class index 58d293e3ac2f57ecb0d68f9093745daca43155aa..0889e27cfdb4ae1074bafda2580001b8afa0d8bc 100644 GIT binary patch literal 349 zcmY+w{P13Jvg{)2;J9mSJiiE^J-Pw3a{( zJv(eUHyOm>Fe8(<7{&-v0ZU2&kC%L S6|5QJgY*k&=0jHoE7DLE8Tq&!LbNI5}{95)%U-Ssba#TrqDo~NCD5YvDQ4Q5n-4ASL865xs literal 377 zcmY+!6+4_>y%WSC=wFSK##-;I2;Ee6pXUn_fI!E<&TWLI)v=T zm3m<6CS1;JXgKZ7B5*1y>^(g{15Hk gvOL=lI>h9cZ;leGpi0V9fr?Z`DOFR6YN(d#z7H%JivR!s diff --git a/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class index 46d7867767600853f0a8f8172d874158a6e38d4b..1e124d916e4cbf5a9e73cfe721b9372963ea1639 100644 GIT binary patch literal 403 zcmY+TPIMIiBq9tnv}uv*+O%InUZZe$tva~6XznK>p0 zH`>w`2h|Qo)fG;vJmf_VGTHyb j?bnv8yFrGSd^u|Tm8h2LsGiC{p~4#c literal 404 zcmY+@JT5)(Ms6)|7T$h{VKi?M+O)g!l43V&R0>{r=O9PWdBa(gHpg zV~8bW{cFL_bcwy`3J22;N7EiB(*bAGH7=$VSJMq{rX%jATRaxM(hg5CLyy;TNSZKZ m`9IveWxl!{bO_PSXA4TGlBy_2c`8sfrBp*js--%rr_vWs9vf)@ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class index 9fc9cdde461e7cdae955511870ef43d24c1fc1c3..38ccb5aa3d35a3159f42137c74fcd92ec399b603 100644 GIT binary patch literal 430 zcmY+XIWBiPo9Go1T9ZRoC5c=Qlg+ieh(hF^t9{jfFJ=>9GT<0hSs;QWL zu&|@aZLq4gIH)dhRPAt5UE!?SdlM5A58|0Tk61Y2b-({~qf`3G7&U`S z+2}(KS^ZkDHJxK;y1?FaiGyi}qiK(m=?Z7lii_zQSJMGE(+%#6?zP23%+TR!hltm5 sh}vUH^1r-(%lv&a=-@*+zt1S4a;l(8%2A%GD5YvDPz}{m9Tlnm3(K7yOaK4? diff --git a/compiler/frontend/builtins/jet/KExtensionFunction15.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction15.kotlin_class index f707d24208631701426f071628630a232f0b9761..b85b433272cdbcc605d158135e7f79da91aca7e6 100644 GIT binary patch literal 457 zcmY+=yAFat6og@RVVA=K%Y=%On$pBqBGGt5?M+NfOneug(QTY?y6>NIWFGcYlnidn zCLb*9U{V|GR9hTW=Qye^a8m7XR_$?7U1Cu!xT>yjQyp+uUE{IpP8vLo8d|*c5b@SS whtGP50?ecNf3W$QbjG%q-iIRHkx_=SR8AF?qdZkoLRD0tYO0}HDpDPVAH!uH$p8QV literal 458 zcmY+=I|{;36olcNJZ?^Il6!|#mZ?+Px}SjHGujJ+Ah;K|<93XNLr(YoQ;v@PM~0vY ziar^fPa&&c3$~_H>`Z6ao6d1CUEpZi;bgkR*|cIZUEyNd<7&FbZP8I1+{Fwn9(D+L y+9Be#9D)L4FaHnLZ<){7blN$e&vzu0P$`vBIaN@ODk-HZ%2PGfP%RaxNZ|{GejhXd diff --git a/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class index 601807accadd9158b14829daa63599a3eb447b2c..f4316415009ad418c4dcbf9b8aadaecf0267a315 100644 GIT binary patch literal 484 zcmY+=y9$Fq6og@S)%CdQ?r3FcZJ8pEB!t{AeIO7B1oAw2yx3&$bl*Sa$kcDgAPMpz z8J)MVy_wr!quOGpI>lafhJ)%HN7W7|)dkL~1sByNuBtt5sw>wqaerMfD=X^H*lTe1TR7z!3PC2TegeoadRa8wiRG=aSs{H}6 CI3TwG literal 485 zcmY+=I|{;36olcNJZ?^IlAB2?%hV~YT~9#pt-T-!g5Y{wipwz;4msWTPdPgF9~pv1 z$ogn-K87rQEm)h5u`!)sYdXcwbcVfYhlA-HN7IUv=>lid9v9OkuCs2m!cELj<8Ft5 zhaDO`?Et*yL(mpuFaJ}PZ<*d%b=oYvNC=pF`amEM2n6y_s;HV;QGseG HP%RaI-VY+G literal 512 zcmY+=I|{-;0EFRe9-GZ3ZYHTLQ>V1|Isw7A_JSY?g5Z_Bg|{&l4w>%zryMtQAJYdH zA?u>v`WR;ZYlD?^jJ0%vjdY5wbcUU@#a=qcLE7OcUEn0`ah5J|nRM+cT#XDf+;j-I z>rmsN1Mt+L!D~7M*J9|*|E0y-jCUv6Bm`pq`#>NN2m}H-Rt^=L41V47PC0h$ror0? zX&(*7Y3NSPt*{ZTu@xO-5}jZtI>lbJ!9jF}qiBnh=p1L!4j0h{u8Xd1iJKBbg}WR) z9&)JhlmqaRLxZ;*0zS*Z+ZJQ5{Y%ngFAB-qPX)2}?Dy0mSQI^UnM-@~_ ORg|Y{3RFV{s{H{JHP;wT;CB%RPnSBBpvzCZ7NR literal 566 zcmY+=ISRs10EFSZtS^hnWGO6Dr}P5eCLp+LF9?Dl2!i0vY`l!IaL9DuKjqlI{g^Jd z4uaO{!o-D{{@P$6?P4kIVI}QjEgfJZ9bzjTVJB^|myU6ePH>b?aT;}DGn|bK6I^u2 zan+%~O$XqvLy3nD6`nfOc#VhLHt1XP|8e#wgh1^@s6 diff --git a/compiler/frontend/builtins/jet/KExtensionFunction2.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction2.kotlin_class index 39af92e571badba332465d6ca129dd6901c8578f..959d9a35d3c72fe8be13f8883cf751da65d59985 100644 GIT binary patch literal 114 zcmd-`lgQWN<6sbARbbF!<6;tEl3)b#83i&?_)G#hD12stGzCVOdLtd6J}V&(AvP`+ PpiTxjixJLZg0q+b5*i1$ literal 115 zcmd-`Q@F#Z#mB)Qz^cHY#m2=Xz$gLYGYVv)@RmJnGVBxEL97Ty-dL z)1ky&2jHPYg{KZRUOF^*>oCD*JQQ|{Zf^d^F1}`Xcv;&zO#IXL>UM3*;)?N?XOQ+aKTWqDf*hy#DOZRa2>%#VNG&1Bk z>ELkIp}<84;HpE3n+_g#9R_&lFvRnJaCU^IGQVRdZ__?J_0}g@)P5XLh69Jc8gWYA*p+kwM4i#QH4Dr@sgim*Hc8o=B{!h=oroDV#+A>Om_H>Ujluz}j gfC{OIiYZGaR7z!3pUNpm6%?oeRZE2OPO7tN;K2 literal 620 zcmY+=ISRs10EFSZY(8U_@kPZlwWUY!FoNK&y&wpJAP9nm;L$vQr!W={neO|i96PPv zW|UhGQRR)|#D^LF+F&N_V=f(FAsu2V9bqLMV=djnM%rR4-NsHj!Ctz9L!%3u;%H>Z zaMB^iS%(4_9e}G2UEFkVxa&~jp+gT(9r}1RhujV@t<3-F@yFDcPn>me64s}Cl%aeo hph7C5VyZ=1s!b(Shf1l8%Bg|^)ukL&Qa!3q4ZazYD-i$y diff --git a/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class index 157077149b1cecbcd2ecc9cd0253ae8ff278943a..a94cd0ef792a9180897831d1f1f2ca7074a62e3e 100644 GIT binary patch literal 646 zcmY+>I|{;36old2o7Xj(WQ>|vT3gz?oq*t5dqEHcK@bEBL2!>Qz%&j{_x)3zz7=>SXV5G&~jYv~vpX@{+J3p?oqd+9a~f1SGyjz)$Q zCmk}Jb;xni0l4bW#Z89-cO80o=+MVghXGzXlz9ISnX6Eb%LLGuNV nGL)r!Dxg9tqGHNXEh?efREJ8bjLIocU8I|{;36old2yu3zD#v5N{YD>4^UIKz|?FB&)1VIoi1i_WL2^XLi4w>%zr##1& z#mfv+>me$ z8Cp2#km9IAhLaA!S%)?*IyhW)$Z^x5gS!r0Jap*cSshZ_M_HKv=|^w#{lVB-7boHO p3m#=Cp9-juil~^XQI@Jx3DuyQREtWfi~`lB9FTA< X4k0!!7NAKCa26w+#RO+D!&xi<6zqXEDQBEN~VpoW%wJ3J?uW diff --git a/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class index 0d6ca995c3e88c01a15fe731405a48ea2e9c8ccd..1a43b8e65252bd4ad5688851817bf311cc4751ee 100644 GIT binary patch literal 218 zcmY+-I}UJgcKU?3Fcg^JRe(jB-5*Fa+8uX6p;ILUPPR5$hdwka8e*)+}ss&?37 sS0)_F4yUrmr5tc8GaluLKHLAdY~#C@R5<%_Hd0oKq@0wO3Q{Z;KTvZHlK=n! literal 219 zcmY+-xeb6Y5Cu`MkG16heK{g@?2smCfEp|zarI0iK)_0y&5I`WdQ%&cL8zv2wxIDd tVO6%+lpS_uk3%`&RAyYt5xvs?o0j)GmsB|W_iUs{%1SvYFBPO%Dn7Dh4+j7M diff --git a/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class index 460597cdec8e1d4a38531b5c3bf6b6222046362d..e9563117059452300ac6e077befd2094d65c56f8 100644 GIT binary patch literal 244 zcmY+;D-M7#5QO2ryQv_Ps>~RSP+`p}fz y!fNcX88_IC0}kVe)0lA?C)~z@rO>}W&h^KXC373<6Q@O5UaQdxT2YI&l9s%WRuIDg diff --git a/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class index f3080ca1b2e70cc50308c6b124bc8e9ac3522d47..98e73365605eddd90e66ce776ee21bc522a9378b 100644 GIT binary patch literal 270 zcmY+;I}Uhu)#zz2nySXo+Ix&`-QH1S`#d}*BIb@y~v=I$LDF$ldGVs>zyEw)&d z9X90(yRyfj9B?W}T*@_WWx=DIF!%QV8JF@kwbI7y%b8(WmSa^c&kC%_s#(HHA1PoG A5C8xG literal 271 zcmY+;ISzwB5Jb`GVU~sfm53ZpOvo*`2m*=KclJFD0VQ?zU-oq>Kj~X_h{g4(@sQ7B z!D8&O8duni19szx!#LqI&bW*fU*j56k@shq@2|1bE;Zpkb1Y$bR>cae$V#ltQda#3 Dp*j+R diff --git a/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class index 978b21df5c504fb0bb14263125584132e45f3971..bf63429fc4adc2f24d6dc0435079183611e44fc8 100644 GIT binary patch literal 296 zcmY+;D-Odj6hu+m@#n=L8U+Og2X+lzOQcF|zNoveNk=rcXq1Z5bxMxGK_VfM0Lh(m4no05)BV?dpW9*6#RGB+Q>hVl z{n_vkM?A$H7IDHV&UlFn-r^n~v11bt*u@odv;W_1J3sHEkEN#bG_Z^nSsg2}GOMt9 Jma_&{{Q~HB6hr_3 diff --git a/compiler/frontend/builtins/jet/KFunction0.kotlin_class b/compiler/frontend/builtins/jet/KFunction0.kotlin_class index e0dd98646fa8ceb435b95bb77029f0940d7e038f..cf3f36482c6e45ff9b994000024f153c8eb58240 100644 GIT binary patch literal 36 pcmd-`lc>_-<6sa-Q()9$<6;tEl3+CA1Ja&C971edEF6pi3;<0?13dr$ literal 37 qcmd-`Q+Up(#mB)Qkfy+>#m2=Xz$n3J#0R9kg*b%RxL7zC1sDKb{{yrD diff --git a/compiler/frontend/builtins/jet/KFunction1.kotlin_class b/compiler/frontend/builtins/jet/KFunction1.kotlin_class index da5c15c649701da034aa55c1203d2abde0ce5a26..85bc1286bc0b743e09f56cceda8b025ffa08bccb 100644 GIT binary patch literal 62 zcmd-`lc?6><6scTRAA6z<6;tEl3)b#83oc57-4)P37|Nu5Qh*O7Yk5^0nTCs0KDh~ Ap8x;= literal 63 zcmd-`Q+UCs#mB)Qkg33+#m2=Xz$gLYGYX_BFv9po5 literal 297 zcmY+;F%E)26h+bb!!UfNFfUY=Q&YMQ*Fj<;sOYBM1yJyk*WJ@ypX%Sniw8Vv7;}lR z>tVxF95IU;8Eke8?s3r-5ax$ZA-L)v_|H JV>zp5l?`TB6u1BY diff --git a/compiler/frontend/builtins/jet/KFunction11.kotlin_class b/compiler/frontend/builtins/jet/KFunction11.kotlin_class index bdcfee8da4d9a0218f86ace28b2081fa75d101e6..f959c61bfcbaa1fe9a44e1258b509c836f11bcb4 100644 GIT binary patch literal 322 zcmY+;I}U>|6hu+m81pbvG@_!UrequJ0|_brq)f!tal=T{-P2uLhyQdjhi!CI$^l{U z#U592z)f7?E{=GJYdpmXFL8sn*zggz_=+=jaffyE=kNS0-%D?O%CVd~mS+W4#fq$& Nl~@hSSS>5Fx&vxG790Qo literal 323 zcmY+;Jqp4=6h+~AlgZ>|0&+=ZIdw|+;Wh$-|5^&}*Ht7byl}hob;sxWvuWo6ry8bQ zB5c3ea27{g#0{?Egqygf@G0`-m-hyVZp diff --git a/compiler/frontend/builtins/jet/KFunction12.kotlin_class b/compiler/frontend/builtins/jet/KFunction12.kotlin_class index b86e095d6081b8cece510a26b40f157517f74772..ec0d743f4bd9a27568e7154b790478cc71c25cad 100644 GIT binary patch literal 350 zcmY+|5QJf`F=jCcMpTs4lsQMvffOlENS#P2a_+dvi0!_Ay3u8P&7C@&CO60A z;YZ0WIGgskm@aTN9dI*U;%++PVY|5QJf`F=jD{jHpt&rsNhmV9gf)z zF?q=T--45AkF)6l7t;Y((0!^6JDF%X@j?HhE7{dS=IyNN0ujt cUi+BB^2Jd?d8(iSRZ@|vD5YvDQ4Q7p0OME~U;qFB diff --git a/compiler/frontend/builtins/jet/KFunction13.kotlin_class b/compiler/frontend/builtins/jet/KFunction13.kotlin_class index 33c6b7e7972ca4b183f5e21efee7e8b955ad9414..aa860231081b1831088f560299cfeadf9cb6b0eb 100644 GIT binary patch literal 377 zcmY+)fluadLA^ z9)6VEf|F^Fv*`jC(*al0C2po8?xrg|Oe>zIYrIS+tef6xgSVKW#b-P8+F_aG|7ib} geC;sk5L3wK93_;e3Mx<~6{(6+s-_avP%YK{09jrc(f|Me literal 378 zcmY+y%uCTSP+Q4LuSPJqP6wgo07F`~K-hr~HwzSBG78 zV@w{h{4=Nz3RlyLo9P;N(+Q77ue8Ba%+TVs9D40AW%)na iyk)+&9dw8(%;y{>l&1ZUiD&SR-a#y!@VeiBy3w)!$dJ@w z*SjG^4_W_Ous7{-FrDFOI>*U$fwSp=i|G=RX~orag`4S!`=VD`;~{2f@U%mV*K$aj oF!u7lxOvO`b=zqdVm`lhlu(|^sGKUOK$VnI6&0zPYN(bG$MwyG_5s&njBI~-IOII8wIsV;F=Ex4$za8(^}TXd2d52J<#Pd&7F=^^61 t9HJylgZY16eaw7*-AU(zo9}0op)8eCjw&cmm6T8w6{wnOsFsRU`T{EI9h?9F literal 432 zcmY+O2h}N#sxzEa=Qyi&xTr2LsTN#Sm$<3+xUV`&h1sZ~#zPMco_Yv) y=^^619)bX4Z~iB2K4y7i+e+(vw)~M$hO$&jWmHZ%s-T1_DNj{YO*K@YB84yR;va|r literal 459 zcmY+=I|{;36olcNJZ?^Il6!|#mZ?*^6c-T?d}}WVf*`mQx8@d%g+osF{Zo#P{YQqN z3D$iwIG;imzZPsvr`Vd#urr-wZ@R$2w8PPKiIZu?*>r`AX^-oyqt>{I85-Q}(Bff- zfTtZIUh^R+F!u64VfmKnja8?e^ZE2gLJ5^p8I@B7<*1TUs-iqqQw`Npfr=EqtO6hI diff --git a/compiler/frontend/builtins/jet/KFunction17.kotlin_class b/compiler/frontend/builtins/jet/KFunction17.kotlin_class index 88ce7867c6a191c219b385b4637b3c0b2545dfc5..350b7dbde6b7e46748f401abd55b10a61084ddad 100644 GIT binary patch literal 486 zcmY+=Jr06E7=&SVf#qX?WuT&@rt~IWg2cps?M*Z$CMG7{#^Z^F6Ta?wryLo(n;C*c zSoP81yoK$4ZLn5tu~8jkt2)6>b&9=ehlA=2N7aIp>Ktd)9+z3yQs8RTP~xtK3J*O5 zJoQlHr3c_WAA&R(d-H!~@iEgq%T`+Flj)#{GL)raDxp%!Q5hvvPI;=JN~)p)Ra2mv EFY%Tkc>n+a literal 486 zcmY+=I|{;36olcNJZ?^I;>{$LW$Kh}#XSTB-`Wd;AP9oHaak_GSUBW#-#_K((0!y2 z8e!E%z4I|-{%gV7bc~JZ1Y6T7cBV7zO*d($8c#a_ujvr9!O+S7mBm}edzP)X&Zpx+5hYYiB~(gfl%sM=seIH0 diff --git a/compiler/frontend/builtins/jet/KFunction18.kotlin_class b/compiler/frontend/builtins/jet/KFunction18.kotlin_class index 27241db1188101b141a7bb115d064b10457cafc0..fcb9491312e62f808f70234ca1105f3a7fb776a3 100644 GIT binary patch literal 513 zcmY+=%?g4*7=>YH)NvejJkH9cYnNS07a;`wS?z-;2!bH!in_9F(ZO%`yk~jr&|X#V zZG=@9^~P!F_SXt)(Ha}kF}9);>_n&7i#8ZVXE=zqIEv13676uFb!`h=lo(3fiZ|wy^5ClPRMefKQ7z+=%-S?mJ$k2UE z?ZSpK%;@JdPWeu3dI3-GdPHU;7{sf*=TjZmNsQ79IR{&wG}~4DG0T zX9BFcpw~7;*#25!Ejq+TbcC(w7(3Ak_M$ZoqEj428=OREIE%Kp%(^l;u1X9AMmdzY z$-&_+hYAll08cs8c*()zJs+HDFm&qw+v2091DD=-ZR6>}fKpUQMN~{Bl%`V3P#I;Z QoGPf2a#Tfuswq!3U$!hIY5)KL literal 540 zcmY+=ISRs10EFSZEH5vM$s}nkQ>XMUULhd3YcB|bAP9osr96!%FcuD(?)#@4*S8zq0GCP!7ytkO diff --git a/compiler/frontend/builtins/jet/KFunction20.kotlin_class b/compiler/frontend/builtins/jet/KFunction20.kotlin_class index 3e14401b280fe75185f6c304c99e4c8d0a45c51e..91af655523323cdce6e16ce2c9987519525a892f 100644 GIT binary patch literal 567 zcmY+=ISRs10EFSZtj}jmCQFerwWW9Q3IV}gdqEHdK@bEB@8x;a!XeXr|CD39=4{59 z^)PF_aqN8f&94pS(moc_0hZDsR?-pH(lIvD3AWM}JLv)T(hi4S=XQvrks-xNhY>D1 zWVq^(RkWGO6Dr}Q%3ARxGFF9?Dl2!deYy*!BrPz#4l_x)3j?c2BM za_eB$I$fB!Fymhv%%xo{q&+O9eXOJdtffP2q$6ylEq2l|_RLv9=Nt@$50d71B{)5=z1;(tGNC_}lFNBLAhg;YdY WDy9-@M5RNI+-%gE zaqc|K8*gkAAO7gq1`BB)OX&bB=@4t_2pegOt#pi?w8LJyhl6y2W2Xz3;$&pVaMq!Z zR)-uH9SU4^0B$;zxa&~ip+k+Q4gbN2QHJuVfC{OI cvQ$htsz)VMN@Y}^%Bg|^RZXMao**Fj)?N? zOzB;KSrL>r31P;+HkeC?SV*_9l#Z~HZeuNNv5}6km3G)kcd(aEaA;%V-3n?&`=0cEI=YEco@ drYsdxj_Obe)unn=pYl{nfy$_y8c;)O^aXJxDbxS} diff --git a/compiler/frontend/builtins/jet/KFunction22.kotlin_class b/compiler/frontend/builtins/jet/KFunction22.kotlin_class index bf143ff9f1eec431b6482d9e3526177838813f6b..8c69e6bf30b6233d9fd7042b8aa844856ce16604 100644 GIT binary patch literal 621 zcmY+=O$vfw0EA&bHT}}m(MnvpZrNqJK@jv``ydF4AP9mMLD2O&MYU*fcF#M@vE%Aw z2B~#0shvR(xp1pr8%(8L%%nZcrF|@q%tV4#24!~8195)>b+;!;Up+gT(9r}1Rht!rB*XDoq@NK@Ij|y7^k^g<&p$z3x i9_3RlDxgBjQf(@tVyZ(WR7zzOsGKUOF4d#@RQUnTDl2{f literal 621 zcmY+=I|{;307TKeBqlG3CX!~r6X*lV{HFAvk7)ahBo#( zba2oi#ZiY0Cmn#Z4mmD56u9b8;-*7|yAEAE{)g1|FsjY(>cP`|J|7mg2x9;9xAvP`+ PpiTxjixJLZg0q+bPIU-b literal 115 zcmd-`Q~1uP#mB)Qkg33+#m2=Xz$gLYGYaIO@RhKIP diff --git a/compiler/frontend/builtins/jet/KFunction6.kotlin_class b/compiler/frontend/builtins/jet/KFunction6.kotlin_class index ca58705e099e9ffd08bef8f4e651e8a77d5b5410..d3e950d954913e4fa06afcdb2c4d80bf23a7b4b7 100644 GIT binary patch literal 193 zcmd-`ljvpC;^SZt$W&m^V&h^GV3Gjw83l4s_)G%1D12stJQO~QKt2keRiFTc&nA$j nzz8$n$O~vsv=E078y5@ECI&c*5zbzqXEDQBEN~VpoW%wJZLSUI diff --git a/compiler/frontend/builtins/jet/KFunction7.kotlin_class b/compiler/frontend/builtins/jet/KFunction7.kotlin_class index a15a620d6422e9c2d10f6c7152f95818d110718b..737b1f81b8dc6a837716bebb724894f9cf711f31 100644 GIT binary patch literal 219 zcmY+-D-M7#5Jk~`r%eTUsj5U*vKAz|2?^hgux5&2l5zK_8(VpF9iqZIs!GYgl+PNQ su)!{DaR@t{!XB3};T8^PqyB%>+`mhXnUd>g#ih9nm*sL?o{PA`3&qY4GXMYp literal 219 zcmY+-sSbcJ5Jk~W_f(LVDr9vf--1RqAz}S~3`H=>xO>!%tvpnRsIV4QebS)uGhq|f r*o6%aVT)7P;S%<^g#%il|2NJ3yX2UCvi+>Mh)Z)BF3aV(JXd%DB)1Qu diff --git a/compiler/frontend/builtins/jet/KFunction8.kotlin_class b/compiler/frontend/builtins/jet/KFunction8.kotlin_class index 96686639ecf096ffcf28610fe987402f8a82f7d6..c3437eb9e73f51473ea86acd5bc329fc34731788 100644 GIT binary patch literal 245 zcmY+;I}UQJe~!iK_3tSG4|y^oe8CcZD?mBqqMw)?+ohH83r=}BS9s`zMN(r1lT x*kBX3*o7Sq;SQ&;$0Zza3lnPA|Nc0)AJagCkFGsYT$;;pSuV%bae1!5MK7ks5b*#2 literal 245 zcmY+;s}6uL5Jb^#X}22$nN%UGk$ez15)$6uj{pRlth-0e$W(6X8gZD5>$vuy_A_BI x_E?Q8Y{mh*al~QFIE@o7W5HDD-|vU_$CxE^9o{ESi?qB}r4_WI7HcIfc>oY`5nliR diff --git a/compiler/frontend/builtins/jet/KFunction9.kotlin_class b/compiler/frontend/builtins/jet/KFunction9.kotlin_class index 91a967deef1822fe17f12625fb1e9768feaf0bd7..7744eb7673508a720242c64e9ccf795bdf55b195 100644 GIT binary patch literal 271 zcmY+;D-M7#6hzUsl=6xo6BH7SWI@OV68>z2B?E#!sVumZBT{SspMHG5hFa=S`uEJREX%PnmS^Rxz$#e6iVwW^ B60!gQ literal 271 zcmY+;xemfG5Jgds<7JWpJ-MQEoiblU6@f%TmhVTx6nWBg_jFh1`jzpf4zKFQG`q9qNXojI1UJgZ{`R%9hsW+|)x E0Wm@o9{>OV diff --git a/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class index 1883836b5f318a002df52a197c053efff2f6d476..b22397019372163dee1ca7d94a75b0470af42951 100644 GIT binary patch literal 63 zcmd-`lbFb;#mB)Qz^cHY#m2=Xz$5|UGYX_BFv9po5zq08mc`Bme*a literal 89 zcmd-`Q~1xQ#mB)Qz^cHY#m2=Xz$gLYGYVv)@Rzq0C&0uoB#j- diff --git a/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class index 6821466ba18f8f8b097619d84c28e82e707c7189..18299455dd25be49f6fb68e31248a4a9cef20931 100644 GIT binary patch literal 323 zcmY+;I}U>|6hu+m*ydrRXhcOxO@&w#5>oz2nO$VVK*31U-P2uL`oAA9=8y(A<`NM4 z!yc=s1LZeiau2WL*Ns*9vLrKA>vM_w702?d Uz^Yi0l~|covy9cS3ae#x8?%=easU7T literal 350 zcmY+x~X_BUCg{)4DnLD!ZMwO8Gr#oWdxygbhZ})6=UhBs%yX+9FTT=0` zy)_$7Vvn=9!$ll$6-V5}33qXihdARY9`F(uY~m4b@r1S7fB)fY?Z|P?b1I=-aV%qb UR>umg$V#l9m01I;utwJO1Dz%pVE_OC diff --git a/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class index 6c7b68ec377e93b38d7dbf74d3d4168609784ed9..12b527f69201b046cfdb282bdeacf72c32e41e53 100644 GIT binary patch literal 377 zcmY+=t?!6;SA)G2eQNJzY)N8$uD+?P-=%68vB-RLrWWa`u*j&4fX z!w`i+dOcyws4mg>PIGawmm@aWOt+<)4a5tUtFkR!h>76!s$!6%Z#WKqO(EOJ5 f+1zWNa#+7PN+?eiRG=c2sFG5uqB2!e4b^@DvHclL literal 377 zcmY+=t?!6+4_>y%WSC=wEH=#g>)j!YUx+3x$N8=cGIr$HTJaZ}13 zvX`|5C(|Bh(-khJ1FohcZl)9NrfWP*E1sqsyi8}jO}F@LdZ!&0*$jjBn2Y=m9lo+Y eJB~W09M*4+63SB*6{tuhs-~1`s7$p~NA*9L#u+*Q diff --git a/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class index ff1fbe5af40c1f8e3a73ffccc729950afcac7039..0d434fd659ccb57a4970ee6cce5d7d263a7d33c1 100644 GIT binary patch literal 404 zcmY+VUKAh>PkHSJi@9b%mSiguCh*k5zA^!PBat#cMre$(RQF lf4KeFPB`87Pd7S`Z#N|^;KyPL z(LuJ7TW~P#a5P=wWV*uHw8zDCz}0k(n`y;jy20Ia#KUxp=c+f_;U#A1@mUW^6XsF= l4|iY5SNDSsAy)ZpK?&uklBy_A1*)c$YN$xHR7dqx`T@`_8yElp diff --git a/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class index e981e886f14bca7480f70ce1a994f7cae4a8d6f8..8869f259c27664499988783e9958b31eccb46d81 100644 GIT binary patch literal 431 zcmY+7gD zm@z~L*ZSMAj-zUilj?x8>H-(lf?0KmtLliG>I(N&w^HL_)zILnhlJO9 sNYY{&?EmuSW0&vSPP!2D<-MUS<*1CxDNhBepoA)^NL5r#HB_S7FJodI4*&oF literal 431 zcmY+E*_#8OoH6 zJ~+rmmKN+yI~+{sIGQeSGF{?q+T&un!qv25HeKUpI^b@)!DH3Ews?veI=t-=@mUX1 rdrV3Gm$zS8zV8Mdd?=Rp86}jXa;l(8%2O4kR80k{p<1e=BGvx@L@*rt diff --git a/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class index 54c52488e170466573397552892ea83dc5c21faa..d11a2c54e91416a334f03587a0abfe879378759a 100644 GIT binary patch literal 458 zcmY+=Jqp4=7=+>MX0!RSNp^=+DO0Buyi!2$Uwc6i1TWwzJfpF2$k#pZlp|CBHe-|w z#gL6YSlIs81{>8DTh%#ssvY*K3mjB?995S%sTQ17SGcGSxT>ykTXd2JccX?D4?RRY y^^ovd4pD$35 literal 458 zcmY+=yAFat6og^U0?T26-3gT?HKncZLt^4xdlM596W_&Wl*S3C`~E3Mr(t$u)C}d2 zjXpTYMwS-rO*54K-f&e-+Z`%o-*WRy^j%Bg}XDNj|DQZ*H*hH9yfid3TT1NCkY?!%=mHNwwglI>%YH$3=C4>!NEZaWiVDaMwe? zLk~5cdH`O_AxMLLs=@O5-Oz}l~F?Fl&1=+q$(;NIbnKsQh?*ep zlfefES<2LcjcJFi=@dKD8TO`g987y0O&2(sR-8?jxR?&Onyzr0b)z-zVul4Cc8GY{ zp~2e@z-K;0Z87%pKV|im>78|_oe$acPeKXhsFcd6obpsbDOFN|s;HV;P?2gVQ0))o C<{;1j diff --git a/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class index f50a2473a9769a24ce5720e31e38002aec1a0ffe..a3591fdf6e2313edbf4d63d1626b884b083491e9 100644 GIT binary patch literal 512 zcmY+=y$ZrG7=_^`P17`O)6+~HJ9l*PjtYYRx(k9J2!gAZzj>_f|u2 z39>#Jtk=-puN79JHP)h2Y(yJuMQ7NFw%Ci#aS-ir6kXsX+T$#`#AVivt8i6fsBx1+ zz+Dav9&!Mla%l0I55Yx@z52hj_^9cwWpvScGaZ&tiqcd{87iYJl~ax?C{LACMb%WG J8VXcP#V~QMJQKb&0cTkBjOG*IBo&#!b}F;I4;& zryg3o^Z>l|(BU&5f{Pe?`MK%x@dhi9hOi+87ieRDyJ+}P>w1oPgPV+HB_Kl I3RFkM9}`0&!TMCfRH@aWmO8DO0Dk@W$OT?XMMYE+onbH9;vhQ5QMAKJbb<4vD_i2C#4y8E z4jwl-RJh9lc*vo~Qw{;I>ELaHp;Q0c<{vfww+J>Emy8cal%g~hQwfz)hRP^Q<&>ie Qs-$L=rz#3mO$Dm?0SPozeq%oPgk4dqEHaf*^P-4`mvMO!xg$jvcx&?41pe zbU~jMAP;ag@$*lD0TY=eS50xJs9}&APS~?nZ_M9y&OT zI@EaT0K9Z)@YccOGasC7F?8mC+v;nk|JL66w1}q%1Ikb#6;UyjP$`vBmddGuDyfQE NP>!l8Pz~j&_6LDBB)I?p diff --git a/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class index e307f1ca0e3974f816a190984b2031f09a16dd75..350fe826ca8ffad7003f5579524470b547df5bc9 100644 GIT binary patch literal 566 zcmY+=ISRs10EFSZtS>RkWGPanPHE?b0)o5tf*=TjAP6>|%k!v(L#F%wDaQ`&%k;T* z5Ohu-CNA9e*9LQG7Yk_*OKBe~=>Ti#5F6gb3Ej>!O)rikJGpL9y+UR6(;`oQin2>OL>$}1yo2yl%--S Tp(a#HWmHZT6sVG_sG4d%U{EH` literal 566 zcmY+=ISRs10EFSZtS|dyDJ)Z`^a9={Ah>HU2!bLAg5b?Ok7*n--SUOLox>(Jmc9SYlG=*<7e`PYnxE^1qci9cTIP=<0TkMgO23aN;)R7@pQ SN@Y||6;w%qs;HW3sP+dhqb9Wg diff --git a/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class index 9e823e3dd4587b88fe385fe9954fd3d2d4bc3260..96c144adacfc442af27edf8ebbf15950c6ec9378 100644 GIT binary patch literal 115 zcmd-`lbFk>#mB)Qz^cHY#m2=Xz$5|UGYVv)@R!Q?$nVO*umeM{}(j%;;18k&2Y^5XYq+{%*Ee_HNj?yVk(izTwUD_NMBf}V1 z9SYoZDADTx+;y1Xp@YLyhYBwpYP|o4!Zuj6=6CGuV}^(4&blZKhL1hUP(C%H0xF~; aDyA%zP$`vBIW?vVs-!?oC`VOPO*LO5Ybdz@ diff --git a/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class index 349080659addf418c503348f8bae132dd95df659..a6b24063040ed823de8fafd26caf4a7714dc238e 100644 GIT binary patch literal 620 zcmY+=ISRs10EFSZtk0Nb5)-ksPHF9V1i@WCug@e<5|CD1VgO_PC z>mV39O&Ggy2j4cBO1qdzdzef6SV#w0N{3iUM_5Z+Y@|EbO2^nqcd`HL+$J~}8B!c| z$Z*mj$5{v9qCOr8stsVzN%hY1Mo+6#gpD1snZ2p-T=n8qQ~egBkW>+0rD za_b?iyh)V!Fk{oS!CczMLb`*cbbys~h_!TtjdYByw8c)ki@kJ$gLDtaRu?wK$;go5 ztV52A4h60{0CycqJalk)>d?nahXLL?4Do3XxgDXd%>U`>*EE;UoOMwWG^cx%p?s=C g1yo2yR7_c_OC?l~N~w&>se%GkQjY3V18PW(epX2;zyJUM diff --git a/compiler/frontend/builtins/jet/KMemberFunction22.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction22.kotlin_class index 7699f86817e5db3e7e305adb8b25004edeb98b9f..d869a77a847b4a31547f7b7959f9b4051b252a68 100644 GIT binary patch literal 647 zcmY+>xeCHi6old2nB^wXWV~@nX>Dom>j;9o_JSY?f*=SMg6KQ?0BYgjbl*SaId)V% zOh30C!k*WUQXhWxZG*A2kBM{*Q|SOR=@4`22n*>LOKFRhbb_^Xij8!J?OzwRj-8RA zfxQkn4muP#>HwT{XyUAc!$pS@R~=fo>CnbqhYp_qLvFhm^~~?|gO~aIVCbxi(%|z2 ok1~``)u@09sfdaxOC?lFWmKJNP&rjlpqiAUN~%S*sSeeB0|@>s=l}o! literal 647 zcmY+>I|{;36old2n8!7V$s|5vnL4Fga4&-3TYEte1W^zK3qf#?F2FPnPWSy&o?|D~ z#jR88z^|M-h+LSVY1&{a?P4a~!d%+JLfXetI>1Ug#9G>7Bi+VUI>Jsm#{RD}o8Vw% z=-{YBijxi*&N={B9dg`sC~()Ii-!(9Jay>frNaR4{~@&{CYAY}e)KWT55|Qpg2-#W o;82EgsTSo?J{3?QWvMn5Q8ATJ9V(?V3RF%NRF~>eeQH3JU(5+C%m4rY diff --git a/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class index 1685ae09e5ff17308de337ef718b944d8d4b33d2..071f17176ad426047a4fc39661b88dbd57b0b010 100644 GIT binary patch literal 141 zcmd-`lUT^8#mB)Qz^cHY#m2=Xz$5|UGYVv)@RSWr literal 167 zcmd-`Q|M>X;^SZtU{zqyV&h^GV3c44@)-p(QTR*(IVgN)fm{?mi$ERzqXEDQBEN~Vp0AcP6M*si- diff --git a/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class index 7affa46fa9df730ee40866e32f30f50993602176..e9c8b3f23a492d6c4e8ae3c86102b9ba6530f639 100644 GIT binary patch literal 193 zcmd-`lUU5C#mB)Qz^cHY#m2=Xz$5|UGYVv)@RzqXEDQBEN~VpoW%wJ*A@*3 literal 193 zcmd-`Q<%V{#mB)Qz^cHY#m2=Xz$n28UQ diff --git a/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class index 5de9342532cc412e6655bead747b3103e41ec62c..577cd03604f31e24df2a26373218feb282043285 100644 GIT binary patch literal 245 zcmY+;D-M7#5QO2ryQv_Ps!DVvN8ljHCL}x$#XTv4P1gONnxR%6T?bO|qpBepnDSX; y6*ky}Ep}mtL)haK4!DFPZecgkHN&mEwhn9%im5SM&_vyY yP1#~sb~uzhPUV10IpS7Mc$68f(7!*g{l_x$7_;wBj1);(DJSKnf>e}BQv3lz!w_-+ diff --git a/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class index 30c377bed0be25ef2cc053135885b2171ae75933..4dfac3adc78ef89229d435bee21b24cdcf730f1e 100644 GIT binary patch literal 271 zcmY+;yA6Oa5Cl=%*yc=tRz!rvgtR~}7D)VyqD~-SrOW1JBe}h8UyDKLOdl%;*M7E` zl^qu40;{serW~*Y{m_CKS DOl=Y| diff --git a/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class index 62a93e084604db7efb4ab05ac5eaf0bbf6a18bc1..51ff5cb65d614dd6d680210941dbfe0670684f07 100644 GIT binary patch literal 297 zcmY+;I}U>|6hu+m`15cPji@N8DYFLFf`kP5kVUagpvXwm-P2v0`@@e9b4Y_5a}5an zZI4A9u!vQU?%Qar7j^$Z_)vzKfu`;W$ IjMcL037psz0ssI2 literal 297 zcmY+;I}U>|6hu)!W1EMIXhfCLHD#8Og&-l3AK6M495;+K-96p)wf*99@qpaIQfh=< zt=q7PBX;qChdALW&UlFn-r^A-vEvX=_=+pmX6N7S=%4r5=TcKY4J>0t*1$@v%qpyr I<*bQS|BG-F^8f$< diff --git a/compiler/frontend/builtins/jet/List.kotlin_class b/compiler/frontend/builtins/jet/List.kotlin_class index f49fc5aff483f1b9b873b1484eee6e026e6feaa9..2b6c2d101c883bdf72391290d578ca4e7a05669e 100644 GIT binary patch literal 415 zcmZutJr05}809M!Ya!SWLa-BIU|=GS9T_}z*o4tfFjWUzHMF^Q2d!9BC%EHm+P522fu=_(@TbCzGjL0Tr!~vN E3(sLD^8f$< literal 412 zcmZuty$*sf5T+MwnnFlJ&|oKYU|^9rc4Y7gOw{6{gKy+d)Q9zYmRJ*}Uhn(4FQ2$n zS7O!)c|F z$Vjx)KsUI~5xK#LEm(<=^#%pbS?A1o5Xp(}S+Fad zpI{OU{(^6E`n>&z{Lg{E%h}U5rY)6Vji{F?mN*&8ZF@6A&!bj&JkF(HzGfC^UG3}x D*=Z&5 diff --git a/compiler/frontend/builtins/jet/ListIterator.kotlin_class b/compiler/frontend/builtins/jet/ListIterator.kotlin_class index 01abc38002ac7a72d20dc69c5cebca49ce36ed71..ba9a7871c7ef7584b4192165e9cdaca0510bc9cc 100644 GIT binary patch literal 118 zcmd-`lUT{9#mB)Qz^cHg#m2=Xz$C$F#0R9=g*b%RxL7zC1sI~ZIn)f!Gdi&Vg*m~T exlB+F4^T$N30d7dh!jf{FHmYe6N=mds2l+E)eTJm literal 118 zcmd-`Q<%x5#mB)Qz^cHg#m2=Xz$n3J#0R9=ggAuQxL7zC1sI~ZIn)f!Gdi&Vg*m{S exlB+F4^T$N30d7dh!j&4FHmYe6N=mds2l+AJ`Fwq diff --git a/compiler/frontend/builtins/jet/Long.kotlin_class b/compiler/frontend/builtins/jet/Long.kotlin_class index 2ad7fe043c50df8defd679157497ac406f9c417a..34e100efe0b927a04de5d5d9eea03f34fe5c034e 100644 GIT binary patch literal 1546 zcmZ{k%TB{E5JgFetdItpx)1_8Ry<0PRf$(%#V4@L|5D(uuxFa;z>rNfIUc#^dg2tW z_3ONx)Q9UT{vLVf)02On7Mm>WzsW=26fPWhWwBSEoC^WJ0I!7S(oa4c;q?fgkMMlQ zo5213j=NucvE^m-zm(dG+m&&)T%9df=i2O}&U3@n+3usxmaDVx+oB0gSIL>XIFd=5 zNrHpEj4RhjcC$@3jVV90$;T!amWaF@iA>JO3bo>eV=%w_vopdb>?IK E1DuVCzyJUM literal 1546 zcmZ{k-A;o*5Jm;fh5&7WSX#Z(3*%3%*);JFz48&fxGn}1l&$q*p zxwDJSQJz-CrVPJjeKPe=G{gjXXx z-SgIS|9a2eFW&5U9{ew*uEp)jI9smHmaFs3?4!<=;p%MnQD@85x$c))>)WoBGk0Mm z$uf}yS)YfMYb3kbB`ZS84{fSLlk+P?UX4U1XJm3lCTC=FMkZ%u@*#43&2C3L$>~W> zPjY&a)03Q@PqTP>Qw3%spFk*{j1cCoY(j0sho7? GWBvo2dx=#5 diff --git a/compiler/frontend/builtins/jet/LongArray.kotlin_class b/compiler/frontend/builtins/jet/LongArray.kotlin_class index 9f12c54b0e81c45b9285df487f4651d42aaea368..128e001698691f8ea21b781f45e75e99045d86ef 100644 GIT binary patch literal 136 zcmd;JlUT)Q#KOfSz!W6Gag5P`*@}yUL4ZvPB*fyx%Ec_OiZM!zgUx^oEWr(x07(l) tadR9~FyL_laoB(yHUmDej@67&N; do8y{-fwL1>ErjC&=ZG2bft9U>DszI!003Ot53B$H literal 119 zcmd;JQ&_@e#KXlTAT7iu!~&!RgY-F$F&Z#iad9vRI7xwpz-(tEwhM&q1d>gS;^w%f bVBieq2tqh6P!1P|m;oP{odS_?f=B=WGYJn4 diff --git a/compiler/frontend/builtins/jet/LongRange.kotlin_class b/compiler/frontend/builtins/jet/LongRange.kotlin_class index d6ff235851ed0fd09996e79b6289359111539814..9ff9fe6b327474a59de3b0b1aa2dc72a81f8268d 100644 GIT binary patch literal 147 zcmd;JlaMgt;bIby6Jir$0n$QXo-B;#!5E~>ag5P`*@}yULBL50tOU$ag5P`*@}yULBL50tOU$0B%B};03|07%>V!Z diff --git a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class index 7bf7f941072..f2e96909888 100644 --- a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class @@ -1,4 +1,4 @@ -† ¥2 -R Â0B -fZ Æ 0IB - \ No newline at end of file +†­2 +R Â0B +­Z Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Map.Entry.kotlin_class b/compiler/frontend/builtins/jet/Map.Entry.kotlin_class index 1bd74cbc94bf0b0ecdaacf8d57aaf08370fd84c7..c2e34257c72c4168db5d27f10fedb6155f6e0a6f 100644 GIT binary patch literal 75 zcmd-`li0wh#m~VYu$)POQHza>Nq|WLB)}-J0!hG#1t_5r#mk{)u#w4$jf({+&j99b Hf^iuERM`lK literal 75 zcmd-`Q&`8O#m~VYu$)POQHza>Nq|v;5h%bYumVZIhy^I28pX?@X0VaTiH(Z|D9-@q IZh~#E#6`iZ#FccJW8?t6n!mI?qLWxFboZF=*znR9DE<~JQU1cSTC5ZC+NiJjsB=+x&yN_ z1&1CC8L0$sWn+S{XH`uHC~06JD8^wJ+;Z;F=ik<`EIBecB5c^{(XaT!>c8>9U5Jj6y2}AG^140c5SykvtTuGPtjQIeiKjs_t6P?6bp{p6@9PS-DgcF)6 z750oq8(3ATW=_gp5Y+FmD-+m1!Jg{v6>aiw@Vy@sCSD1V5@)#Sz+}AB-e<99t=8%;YofU9W-e0BumwW*7zZu#9 diff --git a/compiler/frontend/builtins/jet/MutableCollection.kotlin_class b/compiler/frontend/builtins/jet/MutableCollection.kotlin_class index 778161563a0ca77d5ff230be78407a4af7054d19..a2a0d68d67460635b0a8a6c744f04ff5cf201b7a 100644 GIT binary patch delta 129 zcmeyy_=8c9BTZr>qZSVbgFuKD8yAxR(?mgGHhwND;YBn=Y?3UqVl3)bOa8BGHr32?gDFT)4VX_hd8XYOc2h^!1#32N> H0;V1SqFoao literal 246 zcmd-`Q`pR;#lyiM5TeD##U#Ke!Dz$>q}7BtgxI)PI2Z*O!2B!(KT3*2&0s5&6)#ZJ zHYO>kDkm18E{-TgpxkyQD-obvq!gM#P$k?zB|DhF9QG&?AcxNhq%a%F21%gkE+#9G Wv%-NEfSrY8!EQ_o(3R}Ls{{a9X&EX2 diff --git a/compiler/frontend/builtins/jet/MutableIterable.kotlin_class b/compiler/frontend/builtins/jet/MutableIterable.kotlin_class index 2a20acdd15978aad496020954bb9d58a7849a79d..eb1d47a53003426ad1fc02f58e05cecc41b868f4 100644 GIT binary patch literal 60 zcmd-`li0+l#mB)Qz^cHg#m2=Xz$C$F#0R9+g*b%RxL7zC1sI}4In)gJocOtz1vWDx FgaNUr1xWw^ literal 59 zcmd-`Q`o|!#mB)Qz^cHg#m2=Xz$n3J#0R8RggAuQxL7zC1sI}4IMfXIoIs-42vGp5 CNCgA{ diff --git a/compiler/frontend/builtins/jet/MutableIterator.kotlin_class b/compiler/frontend/builtins/jet/MutableIterator.kotlin_class index 31e207fadad39f952779f08cd8260c2c21ed1125..a76dc2ee1c31415776395fdf663ef68e9321ca01 100644 GIT binary patch literal 50 zcmd-`li19t#mB)Qz^cHg#m2=Xz$C$F#0R9=g*b%RxL7zC1sI~ZIn)exF*&gSg*gCz C9R$4q literal 50 zcmd-`Q`pI*#mB)Qz^cHg#m2=Xz$n3J#0R9=ggAuQxL7zC1sI~ZIn)exF*&gSh1mgs CtOUsb diff --git a/compiler/frontend/builtins/jet/MutableList.kotlin_class b/compiler/frontend/builtins/jet/MutableList.kotlin_class index 53ca0b3f047f77925b8ff1bf04481d1feaddf138..d0092d555a1979ce8a69bbc5affe7afa6d1d84fa 100644 GIT binary patch literal 491 zcmaKoO$x#=5QUqul$iPxib%~)7ZnOZahYY$Ac#4DXA<=QZiQAw#j`m{Bc?5MIWyn9 znfK^EE=W3{9^a$^0}e4+k6DjjNJOK6`IKUQCVD?*W=+!pVMBd%V5>>c+x|!bZlMKNl$Phm{fel(0XImIsg=75- DJBuq?3d=gxI)PI2Z*O!2BEpKT3*2&0s5&6)#ZJ zHYO>kDkm18E{-TQh#VJCj#~;O1W~sSRULbjB2e9SCMyx3x=1OIg=z>3phoFJlpq_0 zPdPVG`3@$qUiK(aAZG@X6Ug9Pgu!52XE0eI8Hu4p5~y<*suHLVqo7itzzPR?8yr|r zw}QO08`C@JO7`Gaq7F1g0NHimFh&YHm`n753TH7{aRXg4n+Y1sAkG{p2kfgngvS9z C5iq6z diff --git a/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class b/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class index 91a56c4689255f6ea3f1fc38b9f3a987e17ca457..d87f533f27be3cc8122fed3b0ab612f5a9f6bd17 100644 GIT binary patch delta 98 zcmbQlIE7K0BTZr}qZSVbg8-`*8yAxRlLVs?KNqvWN=6|LAvP`+4n_e6u)t= o98ugHY6j;SomhZsIVZ+Q$#6tT0!0L@c!5T2W0Hbu0n2j$0G7WDga7~l delta 96 zcmbQjIEhh{BTZpHlNJvLg8-`*8yAxRqXeT7ACOKI;t*ovV&PyEU;y*8Cu*zmu}5)p ks2QARbYcOj;FuUECBq&i2^0~q;sqM8jY$fs11!%D0B_g}{r~^~ diff --git a/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class index 94b3bd3c8bba15102260d029a0019b376cdf5450..d4ae151595e6a66c76a09bec1200ccb18b6a68aa 100644 GIT binary patch literal 97 zcmd-`li0zi#mm7Uu$)PYjf+WuNdm-W6j%Z08cA|73v6H%;t*ovVgbr9z*&q&EI=I^ XQPLc02FIAJcz~t|Ng)@aXgxI)PfD#OF7NZdhP)0RM WnnTUt7?Twb&=5f>h$2QOC=CGVehAC} diff --git a/compiler/frontend/builtins/jet/MutableMap.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.kotlin_class index 7a4600f828a79e0a67049bd3d886d961ae3f18b9..10c44af87ccc003a6a04510c97f39870f9386402 100644 GIT binary patch literal 296 zcmd-`li0?n#mm7Uu$)PYjf+WuNdm-W6j%Z08cA|73#?-l;t*ovVgbr9z*&qIhnS+c zIn)exFgdXR^>RdM0y%4#oRok%wlfMz3xTxmz^XM$45)NHlM_EgDctZV9iaGOCM%GW zRxwFIt+e6+as{D0MkfxiLl`9(qx6BQk1$y&0i};JNl8Oo%EiHm=~k!<<$xM?AsG+$ RF_M8GXKjEuYa_zpi~vmpAQ=Dv literal 290 zcmd-`Q#in+#mm7Uu$)PYjf+WuQGyZ3WfWKe=Nd@>g)@XWgxI)PfD#OF7Nf->rYLR> zHG>^YPAot*>{04K&Kf2s1t2G1NJT|XT<~L3PO2|P8?uY0G%172ULB8$x0C@eUwQ`3TRe_5Elm{raPgolLM;Xg=9L| RvqgCl;W7&L~Bo+;%1_5ujY86dzDX4Pg>g2{%y54kj>%BT5v=;d27nxf$6C dNucm9CM%H3!htq`U4~@CZcH1{mF&T*1OP=W8c_fM literal 246 zcmd-`Q#i<^#lyiM5TeD##U#Ke!Dz$>q|=2sgxI)PI2Z*O!2BEpKT3*2&0s5&6)#ZJ zHYO>kDkm18E{-TgpxkyQD-obvq!h>?HH1c}5^kW99ZX;jdz1)}!{-E2n2k^vB?%PW a#bgC?RyfcCu(OaX*o|ocx{^J3l>h*str>d& diff --git a/compiler/frontend/builtins/jet/Nothing.kotlin_class b/compiler/frontend/builtins/jet/Nothing.kotlin_class index a3c038ba10f..5da870a6e3b 100644 --- a/compiler/frontend/builtins/jet/Nothing.kotlin_class +++ b/compiler/frontend/builtins/jet/Nothing.kotlin_class @@ -1,2 +1,2 @@ - ÇR Â0B -r \ No newline at end of file +¹R Â0B +¹ \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Number.kotlin_class b/compiler/frontend/builtins/jet/Number.kotlin_class index 214a7903a58..b2c01ede094 100644 --- a/compiler/frontend/builtins/jet/Number.kotlin_class +++ b/compiler/frontend/builtins/jet/Number.kotlin_class @@ -1,17 +1,17 @@ -& 2 -%R Æ0B - Z -&06B +& 2 +(R Æ0B  Z +&06B + Z &07B -Z -&08B Z -&09B +&08B Z -&0:B -Z -&0;B +&09B Z +&0:B +Z +&0;B +Z &0n+a delta 46 zcmebA5$8x#aMa@FU=TRLq{YI;B*19I2P9P{imM86NAYqzQ!sFHV&h`rU=&~g0H%Wm Ap8x;= diff --git a/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class b/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class index 47294ffc9ea..cc7689247ee 100644 --- a/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class +++ b/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class @@ -1,3 +1,3 @@ -f É2 -Z æ 0cB -# \ No newline at end of file +fº2 +Z æ 0cB +% \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/PropertyMetadataImpl.kotlin_class b/compiler/frontend/builtins/jet/PropertyMetadataImpl.kotlin_class index fb65a697b9d89dbfdc59c1c4d44da5dfe0b2b592..6846db0f98c579461fba908c149c55517396c237 100644 GIT binary patch literal 51 zcmd;Jli1B@#LC4iu!}KBg5wyY0kahs2ZKPe6bl!VfT|NnW;bILH^(&vgJdVL7y!{T B2pIqX literal 49 wcmd;JQ#i$B#KOfSP#h%Aag5P`*@}yUK_FQQB&6&FB1@vUIj$)fB!fB10KQQNm;e9( diff --git a/compiler/frontend/builtins/jet/Range.kotlin_class b/compiler/frontend/builtins/jet/Range.kotlin_class index 980018870886b099ee89e5a314746b9f744e4a0b..13d9e551557aa6939d46e0e26faded294b4854fc 100644 GIT binary patch literal 90 zcmd-`laSLA<6sbARbbHK<6;uv6XFnJ<6_}p6ksr70rHumBskOz+^l$jYTTuuGEN{F U&M01vX9@<+PEbJz*9pc20CTDdO8@`> literal 90 zcmd-`Q*hN1<6sbARbbHK<6;uv5#kVH<6_}p6ksr70rDB6BskOz+^l$jYTTuuGEN{F UjwoJ^X9@<+PEbJz*9pc20D{2@b^rhX diff --git a/compiler/frontend/builtins/jet/Set.kotlin_class b/compiler/frontend/builtins/jet/Set.kotlin_class index 80c1cfe401231eb9b0854c3ef58923245d9210c9..b5f30602e8c39d79482c3622213625d6ce466ac0 100644 GIT binary patch literal 225 zcmYk$u?oU45C-608{-*D2%$*GR2(vNDvlXD_ymIX>g?&PFsm`3z pt1u!IRk4cDA|#0l=3CEAE_=gyEm!_?i=MM|un4UyoNjA(_ycW<6N~@= diff --git a/compiler/frontend/builtins/jet/Short.kotlin_class b/compiler/frontend/builtins/jet/Short.kotlin_class index 8df877556ef3309b072512f3c0563e9fe814482c..c89f298c2db37d6d475c0b489bf60d0e1ca8847a 100644 GIT binary patch literal 1383 zcmZ{k%TB{E5JhQ;EE58CVi5v6Ry;~kREbw$#V4@L2lHLTGc`JBI}tvwgFCo_DTGSMmGQ|E$L2FS(d|@5Y;{_DA93I*~?rW%#DRLxHyiUKM!v$NPUi z@xbfF^Hy>cx4VKfIi1PXIhg0Db89%A`5blb%>CJU@cr0Njcn_dZP&v}8l24a^36S( zJsg^)mRq#k7Fv?CB{^G?vn4rOlCvdwZkbNdW5JW0p5*i-rzbf*$>~X+J=3;3Y`ZHs zlhc`;&g66^r!zU7$+L6X_Q`l&$%!LZPs`P_H}|XOrQz!73|G&=aP`#pJ{wQ{7a`}K xv zPdM^=@w}BB#O*HQOipKVb#Bdb)Y%(OXFf-rJ9B?>9$Y{6QzP3}%eKW(NCP+5%QyFE z_Hb+#Tkg60uEU=F; gikst_f`PLWSS^I(0_Ly)IbsHUU}bxu%A6p|0A^|r%K!iX literal 119 zcmd;JQ#i+D#KXlTAT7iu!~&#+g7i6#F&Z#iad9vRI7xwpz-(tEwhNfek>0UwxM29a=rr~&{+?hiu% diff --git a/compiler/frontend/builtins/jet/ShortRange.kotlin_class b/compiler/frontend/builtins/jet/ShortRange.kotlin_class index a21d245816e69abd98320bf6b1f7be6944f2d32e..9ad3208aadda4240cfcac3320b9c841babcf6e91 100644 GIT binary patch literal 147 zcmd;JlaMsx;bIby6Jir$0n)-?o-B;#!5E~>ag5P`*@}yULBL50tOU$ag5P`*@}yULBL50tOU$Mu`Ena9MEyWw^mQSis`^QQREY6bu58wCiHgt{TM! K)E)>{r3wHamJlrf literal 163 zcmd;JQwTER;bIct5n>Z!0n*AwAhI%uo8uUx0kacWC`z0|%s|nKn}b2%0+SS22rR)A zCBeaFAZEn_ln|9-1L|XxUM2P{la9MEyWw^mQn84zEQQREY6bu58wCiHgt{lY$ K)E)>{r3?UQc@Uuh diff --git a/compiler/frontend/builtins/jet/Throwable.kotlin_class b/compiler/frontend/builtins/jet/Throwable.kotlin_class index 696784bf612..f962a06d683 100644 --- a/compiler/frontend/builtins/jet/Throwable.kotlin_class +++ b/compiler/frontend/builtins/jet/Throwable.kotlin_class @@ -1,8 +1,8 @@ - Ñ2 -R)Æ0: Ò -#: Ó -zB -zZ 0ÔB -zZ 0ÕB -#Z 0ÖB - \ No newline at end of file +À2 +R+Æ0: Ò +%:Ó +ÀB +ÀZ0ÔB +ÀZ 0ÕB +%Z 0ÖB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Unit.kotlin_class b/compiler/frontend/builtins/jet/Unit.kotlin_class index dcaf65c8771..235cc87b0b2 100644 --- a/compiler/frontend/builtins/jet/Unit.kotlin_class +++ b/compiler/frontend/builtins/jet/Unit.kotlin_class @@ -1,3 +1,3 @@ - 2 -HR Â0B - \ No newline at end of file +2 +HR Â0B + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Unit.object.kotlin_class b/compiler/frontend/builtins/jet/Unit.object.kotlin_class index e82ca791691..9373b2b24c6 100644 --- a/compiler/frontend/builtins/jet/Unit.object.kotlin_class +++ b/compiler/frontend/builtins/jet/Unit.object.kotlin_class @@ -1,4 +1,4 @@ -† ×2 -R Â0B -{Z Æ 0ØB - \ No newline at end of file +†Á2 +R Â0B +ÁZ Æ 0ØB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/atomic.kotlin_class b/compiler/frontend/builtins/jet/atomic.kotlin_class index c06c58efc87..54650ca9fc4 100644 --- a/compiler/frontend/builtins/jet/atomic.kotlin_class +++ b/compiler/frontend/builtins/jet/atomic.kotlin_class @@ -1,3 +1,3 @@ -† Ù2 -|R Æ0B -} \ No newline at end of file +†Â2 +R Æ0B + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/data.kotlin_class b/compiler/frontend/builtins/jet/data.kotlin_class index d221fae70c4..0a3adc94952 100644 --- a/compiler/frontend/builtins/jet/data.kotlin_class +++ b/compiler/frontend/builtins/jet/data.kotlin_class @@ -1,3 +1,3 @@ -† Ú2 -|R Æ0B -~ \ No newline at end of file +†Ã2 +R Æ0B +à \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/deprecated.kotlin_class b/compiler/frontend/builtins/jet/deprecated.kotlin_class index effcb6ef110421a09effbce8943dae64a1c65cdf..bccb134bd449c7aa4c41bc62756fefe052704b9a 100644 GIT binary patch literal 38 rcmd;RW0E++XvD(BB)}LX!EubyfZ2+RgF!%03M8cJ#LC4iaD)*6Z0Q9e literal 37 ncmd;RV^X-yWW>V7Bv2D1&T)*V7Bv2Ei&T)*required int32 name = 4; + * required int32 fq_name = 3; */ - boolean hasName(); + boolean hasFqName(); /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - int getName(); + int getFqName(); // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; /** @@ -4537,9 +4537,9 @@ public final class ProtoBuf { extraVisibility_ = input.readBytes(); break; } - case 32: { + case 24: { bitField0_ |= 0x00000004; - name_ = input.readInt32(); + fqName_ = input.readInt32(); break; } case 42: { @@ -4890,20 +4890,20 @@ public final class ProtoBuf { } } - // required int32 name = 4; - public static final int NAME_FIELD_NUMBER = 4; - private int name_; + // required int32 fq_name = 3; + public static final int FQ_NAME_FIELD_NUMBER = 3; + private int fqName_; /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public boolean hasName() { + public boolean hasFqName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public int getName() { - return name_; + public int getFqName() { + return fqName_; } // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; @@ -5141,7 +5141,7 @@ public final class ProtoBuf { private void initFields() { flags_ = 0; extraVisibility_ = ""; - name_ = 0; + fqName_ = 0; typeParameter_ = java.util.Collections.emptyList(); supertype_ = java.util.Collections.emptyList(); nestedClassName_ = java.util.Collections.emptyList(); @@ -5156,7 +5156,7 @@ public final class ProtoBuf { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasName()) { + if (!hasFqName()) { memoizedIsInitialized = 0; return false; } @@ -5198,7 +5198,7 @@ public final class ProtoBuf { output.writeBytes(2, getExtraVisibilityBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(4, name_); + output.writeInt32(3, fqName_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(5, typeParameter_.get(i)); @@ -5242,7 +5242,7 @@ public final class ProtoBuf { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, name_); + .computeInt32Size(3, fqName_); } for (int i = 0; i < typeParameter_.size(); i++) { size += com.google.protobuf.CodedOutputStream @@ -5386,7 +5386,7 @@ public final class ProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); extraVisibility_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - name_ = 0; + fqName_ = 0; bitField0_ = (bitField0_ & ~0x00000004); typeParameter_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000008); @@ -5438,7 +5438,7 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.name_ = name_; + result.fqName_ = fqName_; if (((bitField0_ & 0x00000008) == 0x00000008)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); bitField0_ = (bitField0_ & ~0x00000008); @@ -5491,8 +5491,8 @@ public final class ProtoBuf { extraVisibility_ = other.extraVisibility_; } - if (other.hasName()) { - setName(other.getName()); + if (other.hasFqName()) { + setFqName(other.getFqName()); } if (!other.typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) { @@ -5564,7 +5564,7 @@ public final class ProtoBuf { } public final boolean isInitialized() { - if (!hasName()) { + if (!hasFqName()) { return false; } @@ -5781,35 +5781,35 @@ public final class ProtoBuf { return this; } - // required int32 name = 4; - private int name_ ; + // required int32 fq_name = 3; + private int fqName_ ; /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public boolean hasName() { + public boolean hasFqName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public int getName() { - return name_; + public int getFqName() { + return fqName_; } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public Builder setName(int value) { + public Builder setFqName(int value) { bitField0_ |= 0x00000004; - name_ = value; + fqName_ = value; return this; } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public Builder clearName() { + public Builder clearFqName() { bitField0_ = (bitField0_ & ~0x00000004); - name_ = 0; + fqName_ = 0; return this; } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java index ad648d7896d..e10de6faec7 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java @@ -35,6 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; @@ -45,7 +46,7 @@ import static org.jetbrains.jet.descriptors.serialization.TypeDeserializer.TypeP import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; -public class DeserializedClassDescriptor extends ClassDescriptorBase implements ClassDescriptor { +public class DeserializedClassDescriptor extends AbstractClassDescriptor implements ClassDescriptor { private final ClassId classId; private final ProtoBuf.Class classProto; @@ -64,6 +65,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements private final NestedClassDescriptors nestedClasses; private final NestedClassDescriptors nestedObjects; + private final NotNullLazyValue containingDeclaration; private final DeserializedClassTypeConstructor typeConstructor; private final Modality modality; private final Visibility visibility; @@ -73,29 +75,33 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements private final DescriptorFinder descriptorFinder; public DeserializedClassDescriptor( - @NotNull ClassId classId, @NotNull StorageManager storageManager, - @NotNull DeclarationDescriptor containingDeclaration, - @NotNull NameResolver nameResolver, @NotNull AnnotationDeserializer annotationResolver, @NotNull final DescriptorFinder descriptorFinder, - @NotNull ProtoBuf.Class classProto, - @Nullable TypeDeserializer outerTypeDeserializer + @NotNull ClassData classData ) { - super(containingDeclaration, nameResolver.getName(classProto.getName())); + super(classData.getNameResolver().getClassId(classData.getClassProto().getFqName()).getRelativeClassName().shortName()); + NameResolver nameResolver = classData.getNameResolver(); + this.classProto = classData.getClassProto(); - this.classId = classId; - this.classProto = classProto; + this.classId = nameResolver.getClassId(classProto.getFqName()); this.descriptorFinder = descriptorFinder; - TypeDeserializer notNullTypeDeserializer = new TypeDeserializer(storageManager, outerTypeDeserializer, nameResolver, - descriptorFinder, "Deserializer for class " + getName(), NONE); + TypeDeserializer notNullTypeDeserializer = new TypeDeserializer(storageManager, null, nameResolver, + descriptorFinder, "Deserializer for class " + name, NONE); DescriptorDeserializer outerDeserializer = DescriptorDeserializer.create(storageManager, notNullTypeDeserializer, this, nameResolver, annotationResolver); List typeParameters = new ArrayList(classProto.getTypeParameterCount()); this.deserializer = outerDeserializer.createChildDeserializer(this, classProto.getTypeParameterList(), typeParameters); this.typeDeserializer = deserializer.getTypeDeserializer(); + this.containingDeclaration = storageManager.createLazyValue(new Computable() { + @Override + public DeclarationDescriptor compute() { + return computeContainingDeclaration(); + } + }); + this.typeConstructor = new DeserializedClassTypeConstructor(typeParameters); this.memberScope = new DeserializedClassMemberScope(storageManager, this); this.innerClassesScope = new InnerClassesScopeWrapper(memberScope); @@ -131,13 +137,13 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements this.nestedClasses = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedClassNameList(), nameResolver)) { @Override protected ClassDescriptor resolveNestedClass(@NotNull Name name) { - return descriptorFinder.findClass(DeserializedClassDescriptor.this.classId.createNestedClassId(name)); + return descriptorFinder.findClass(classId.createNestedClassId(name)); } }; this.nestedObjects = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedObjectNameList(), nameResolver)) { @Override protected ClassDescriptor resolveNestedClass(@NotNull Name name) { - return descriptorFinder.findClass(DeserializedClassDescriptor.this.classId.createNestedClassId(name)); + return descriptorFinder.findClass(classId.createNestedClassId(name)); } }; } @@ -151,6 +157,20 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements return result; } + @NotNull + @Override + public DeclarationDescriptor getContainingDeclaration() { + return containingDeclaration.compute(); + } + + @NotNull + private DeclarationDescriptor computeContainingDeclaration() { + ClassOrNamespaceDescriptor result = classId.isTopLevelClass() ? + descriptorFinder.findPackage(classId.getPackageFqName()) : + descriptorFinder.findClass(classId.getOuterClassId()); + return result != null ? result : ErrorUtils.getErrorModule(); + } + @NotNull @Override public TypeConstructor getTypeConstructor() { diff --git a/compiler/testData/cli/wrongAbiVersion.out b/compiler/testData/cli/wrongAbiVersion.out index d8ee22b66b5..2e6d10b255b 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 7 -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 7 +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 COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar b/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar index c525df804cb360405f81df543886d0e8609a2e23..1e6926f8ba3440e5c91ca390417e3efbd49dcfa7 100644 GIT binary patch delta 331 zcmZodM@MdNaVc-Bl>n(N@d99d1lvg#FI-vljUK`fu3rFW_aygk-GP2*+7Wc^qW zJi$NvU&_@@wkvWYUwZ|$w45pZyYZ5FufVg}QQcAHm!zt*?gS;<;0zREU;+_9z{$V@q9#i*sepoFvLll{m~Lh=-~jTSLFP=}&Ey6E Dct3!I delta 331 zcmZodM@MdNaVc-Bl;UyLmd99d1lvg#FI-vljUK`fmpK&9~J5XTPNp6b=*Fs}E zf)37~mKSsP$U+|>^$R;cK8*RnU^m6W<^7|WbB%|~_to3&XNXDkvJidjn%`_wc=yvi zjQ|hne+hRt-hO?2mEl&6BQ1BnA6{rSeXW2Pf3M))cS|?F+h6Icv15~U@rP~Yg$f!@ zpN<`3v9+B2sbJHYpz8X4duFRf#wk^cdv)g2&bSDsqse_7od5I=eO#fb_E6v9L{sp03#WfvpET+i1H9QeW}G~@ z{3-(j!*3uC@MdHZVStB$Gf;?u2}A$^Cj$$Jnk>bn0t$-Bj!gDox|zv<1ITvgM7N@MdNaVc-Bln=N(|d99d1lvg#FI-vljUMtq$&b#a&VEcIM1QuPZifv5#D-7Nozq@$W%L@JFI3B(Wll`K3*)qKXt_w{s)T%9y>^8mOnf5 z^vu)i@8^dzlo=>&nX@g=MDw#+#|EqC>upZ${9$1=>ul+>Sph8->+Zf-T6TS1gTSp# zQ7OM3rmJt$T=Q7z^7nd*G0VMYnaNr>zpdHl=ma%jiip=lVE*`RPB)O1;2w=GcRu z7jINoeS278ZF_fZRc&1T-@5g`j^($NIJ~X!Sfa5k&ck};r^5=qCzd~mY_30?csYAT z;v5+*)6W*3d_hlDwQ7zm2{E5wm1(Yb-ZU{cC~b~^Wn#s&*N=Zqet1v!ePKq{h5BgG zb2S%(lY3n*FVc{;o_RYdy6mgs^ajGe;@Bf8T|9TBX)OcMEHeY++Q{na&5ZthdIETo#T66 z^7BcI3=Eu13=Aj{Ie7<@VST=Ebgm|slX)d0`<-2@xL0nu@XOhJUEZSrwNBv|cYYM; z)iB6=$t1mh6mzceaCu$b{(X#hlALCAl`V?f`({Vhj|IUK{Imb1T-{{5A~*82S5QmK znbN--FPZlWJewWW9aVlwsygeQV3FS0IQh9Rb6#*NJAFBKh{bf@oPzp&9!bUZTO(p! zJR^?y`zW66Sh=JBkx3+*s~AtEbDh&aqXTk2t2wWq-z)lg;rC-RH(mA4wod#g(k{v5 z@?$?kdh;=f-}dZ^AN6XFaNLwWq4*!{+od*^Kdv$`F#HDM0B=Sn5e9g|bp{GC00RLG zI2l+#^yKHvDxmZ`nUBRDOb4(Sa02f+)J@MdNaVc-BlktG%rd99d1lvg#FI-vljUMtq;dW!^#)ScUFY<=!cpVhkA zGlg`1C4O!0W>wNWxFscodE!wgmP2ztt}36Mmhe8-{>S=7{7z2x3*<%T-rU6eectCe z)1UA8^Xu^&5Dv#rBm-uHEOx&u`bPbL}5PfHymb?%l2D zCo(cHa56Cf`AG3Nc_))${rwp?qPznIcAez5cyKK=wj=1^{AqbHcaJRe5mLXf^W(#q z9}IR=EL`3{iaFPKxO`u|-F}9cL@x``$FBL!HidUT-O~v0kp7o&cjN8X$5$C{)i}~} z=lkJ>X4BUSi1GId?tQm(^Sk|(z8X6=Sr>oUR$i!};q>X)Ar@Q9*`EqFoe8S0-?wMB zYGll^^FD@WJ6G=U44S%jkx~D#JxdK1-sss7eOvO-(bEr(?3+FJ>$X>CPVJ0~U^<%I z$HDne@6g8;nraXA9Zoa_f46Y@$Ms30juGVB87B`ezskVC@EeE&ycwB97~tvF87Ra6 z3O|~P< GAT9vE250*K diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar index e9c28a7f36d244a0c93bd0bc9488fb5474032c9b..a52d47d5033d081cd555a19c18dddfc001e458f1 100644 GIT binary patch delta 2446 zcmZXWc{mi@7srR8!B`v0P7*@IFie;sgEA>ZArU3TsBD9mW*CiKVUnFF%2u|Lv>0m! zL)NlR7=&50@iOYg@Av%PdVcr*aqfAZbI)_1`}y8`&TXkgDIr@lkVhQAw>3@b5UD~( zfZN78e8;@ozhjts_@se{$&m5giiOu8R}xWbuObsnuZh`T;SsksomTSe=Y_q%dRdZvdZWy1^m9k`2|3Y1 zn3w`edv}y>NL_J|Xwz9Ib{KwDBw28Hav#a@z zV+ZD6lxNJ1b!9|koH;rWa4@K|C~fBBr4;i(tR&A^j34h%AD>O_JDI4DbsHLFSOYdh zJRxUL^W*o|k(i6YIFoU(U&{gd`!X_+p$w|9zL}DQx6l(W-TmMga~|YDUx}xhrymsN zh#4f!puj!ns^#gboqBRz;p$Hxi~EQ#p{e@b{6EWDR1$rnia|p@4U`HIq%hK&2<>W{ z@@9kX8oZhQ)=t+p{MyjO6QPxVsjt=fe$^hsc1SIQuIIR`+grBMi+#Z}9kNR{NZ@ca z;|oK(unQNx87K>%vH~;q-WS}9Xop+Rr)R%7^-;Mq+)bcih1Jj}R)6%H!v@g;;#<_+7KzZQ^@C&S!>%|7IDt{2DA zP7UMV_MRvjuv1DTTy%sFoKD|+1kH<{#xE1~(r)}+Bvo-zTi(KZrm9gu!OB}bLShxk z%IMet^@fxXDPt+Y51) z^(}j_<7(NLWZAaq=u=)k--y|ZM+5zHOR`d9h9o4Lrj1rMom5w5T6CDYOBh32e*83Z zNM$p!8Yk0gf~hr<2z_^jY}WLg0tai20m8dk&{cT9WNqVDUWfaCgSPp(n$DR&J?f5)yr=@S*uFh%kt| zg@G6^Jijv@d!gorO7JRi@Ylf{qE%vVd^X>qSWFFm<2WQ6jSX49>XP|Hbh+k0g*Mnt zC+##yzA#`Y@T)_yHFAGuNQk9=MUfkks81+HmgU+iXof9A2xdCtT_;r4O-`Wlp=Tv7 z>Zg5m^(yW32;=cpuTzYe0=IOL)?-0oA8w!29^I&2&GXO}kiQAu9AR-zwl$0o%arGx z%df}h6|k-$RyZB23N>y&u-v0X2@p}K*%a@N%7vz?o_EPYx}{z}u3Ld-UEG^PrDOA# zp7zy3~fV2cm;F?6jQd%(T{K;l8vCd=N>5{4ePU7+#e$O*c%?3I~x-``3rq0qT z4H6y7!EpNq&uy-IvVn68WSZOx(@=fIxdS~j>RIRL+4N==Lca6mFOn}K0R^-{*o@PB zn#eW?nehhBS+Oc=WUr;)Tn^`Qp8tmqeN1jtfa|Xvx~50uA{w{op7=ky1|S&TTc*+} zfhZs!@IHr&w=gs%K@At_g4QNf9e3|S_oH%bHl~c%fE>H&+F%jrvY=7z6tch_aI#M+ z$ilHG(OGYl4N;Zqy(^-$T=HsG&3gvXUTWPM>o-`wZZg83xNZce-s%fGmX2C2o_)C{ zVyMa^yHxGs@KO_VdPLC>vIno?y3G3CLZ_172TkTxF#qx%$oaGoJ$ceXfl@{f#V#PA z9|u)R*!}*UGEN=?E=y8by@ZS!H|0f_`Gh{1Vd6rA^pbT)gS5ECLCun9M`iZNV%nRB zrO#tzn31%sp0^gjp0l<@+TLxQf1bVknGFB{B)4wkzdGObpMpmU;Dh0>^~3z28NrM* z?g*YXgVq`$(6p%MM60tL)i$N{M$Y77rL%5M4wHnm<{Y+VgVr9jk`_6$QQ_2^)WAvn z&-EX`CKWBn5lgz|BUZQ_R@XK#T{fvi9p)(N5vD$0lX2{F?`s0hCjB!*Baj(j$oBV7 zTX2$=@PF2*AVeOziobSAy4?5Hck-_sW5q%2H0sf)v2t8aeatNil^gaR^*|Wx2GM_^ z^-F8eqh2 zl)zZ<(E?0Bb3#ybnWI?LJd0na<{^s})BJ_lc<6ZCy_T@?HwDQO9$qPJx>A&^dk;_+ z#nT?{UTvCZ!e8=Cv?%GXI|&6p$r2jSgZ8uK;jqvUnFuM|#23j|S#8g6?+PE5s?^ac zUXdGKf@4?P^PN&fItWJWcsm~- z=>}MW+Z0H01IlXHqW?%^{`=d3Y$@m8p-G~Gl@zv9{;n$7e*?BwY9tXs4aM!4-;erd Uj3*x{icg*tDk!?kO<;TXKP0bYLjV8( delta 2444 zcmZXWc{J4D8^?#S3}fGkF<*N!!q{S%8f%6uja>;%BxET|mQRT+Sz=Nd`&P!5rDV@g zA^Vb%QiCG0lRdup{m$>(_x$et3| zG+$f6n29^=)I1IsYk2H~f?r*!NLT;fg~Y6{P2ieDd`tQxl2!jsPYNgkY9xIQB7lTkSG(d23A$=aTcC23wj1xLvuxftcVT_oOgIO3PYo zAJ6%+;CM;vq6pXMZ)0?-zFo%qguOs1%Qg8P1~xtQlzK7FXG-GSCDA&=tCJ;Zt8pgT zu5?w68gi3LvywJXToSacNI;^(PH(%CLzkw4x5`gfF7o_-8wbp~GoV`Jr*^I7<7>TK@!0PtPH$t>^As| z&9gazS#RbJk1o%-XbTDHNN0#{?psWFrPE*Jta+kt;-0~GKKlH2ld>) zhmuD*gq`g+whe6=+d$iwZ3C`FZy3n0g}ZxP2!cBi@P)Nx4fjIpac2T`^!#})yUG31 z7p9PR#jhQwR8>C8SmHY>iikvA{(=r9Ia$Iq^+Yk`>!Meb+y@xO;#&a7rsE-0dgeQ|!+tCDl7$5qw@=QO1JLHYzWBXJe4 zIM~}2J2WXb_|`7r%JO&`{z`Z1IpeD}>hCK*%XZEhu~3&XHp5B?o6F+@_FZ+?*aCz3 zYkZr|Il7iOGWhVaqN-`t1VjuYJc`r(%$$x*NUdJ$0w*ZD_`mvc*T`d^=Fq^)kEK2r z(11YF2PXd8z*F>6z$dT4(>&>uScf)65}{7{yM-XF`x&Dl3nm}VWbOz^yaf}n!8=K{ zqiF1sM>NF{wQPd=Yq^9%o-~J_wR^FlF^76CgYmx7nevK2~abpx5LKh?kV~loU z+Wj&u-{MTZDOuaPSK3Bp^+xhVEE+g%dOGYc!P!Ht{nurO1M3^VBG>sA7pqTRTrZut zJoH7dQFFaP6W9uJ-KdyG*X=*pT3Lc;Yg?w@EG=kIN&8ai z#X!>K$x@15(Ff^M=C#hg=}%Mnh^$lU5oAFhe~*+v9~(CZ`#7)10_BUpb(iuQzI?Z< z7tXySl_gc?qe7)>WU($de6ghKLQ<>xSTohOy7?x(Z+kj~Lf==cvLBi|(y3iicVMpZ z|CxIoB1AA{6b1}j@_4ZoW@H`tTgYs9G$Sc`g0b-BniwQ)?PY^RX#bVLJvH_{5b$u* zW2}`$v$bb#qj#GBw#y611@ja)WPH@MunFa967%VZj5vN_evh#>iSr~n@6ubAulY6b z=76+8Er$ksYVu~&LrmKKZ9hzV42%?1fSnwzyG@O^1)g|Uyb9(+RBy0LS1kkvQ8Y6? zv)mJ1^B3Db{Rr`VTz?Nqzk z5w1g2fs4d~tE2dr^Rt~cPbQ$PN@S9HgiVGzG_MM$%i%Sk*{Fim_p|Q@B*O$`Ho?2* z6K8LRtu$**YfqnAL<6BaG*mWu?om5FJN)9UyxkjcekHBAXG;BS(d8Pv(0(j^)$~OI z)wEzi#4vQB^3+ntuCirJpYNLwUO*q6H9ivHvlV;JHO#nwedR%U<>P$W^V^){1|L7; z!a0N!t4g4yz|u9FJ3m*Rn@7@TU7Fb_g45mgP2jJc+6|M94KKFTD|zQ@Rfs|cor$_D zeNd@F>VLr5VFvkVg)yKAOf>ezVMa3J7dw;%gCN%G=AMDlQ zH1}DXW8Y#7+nk^3roT5Q1&%!43VGBXY8k%Jj~blSO|Z;)5??7t!K}jQ{R0D_A%bCJ zD*_FvoITd3NflHv0{+Ru-UQSn6S{S zc~jltKzDw2%gO9hph{tkQsdxXPJ>q z2f5Bsy&_0Kwc&@^pP!%50T}-b44B{m7A9mvSws(oe?BDce^dvnlY~yF*pcQ>x`h9w jktMLOoPZqeb9iI|nuU)R4V1%1291Kp(hvL5h4(3v_ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar index e9c28a7f36d244a0c93bd0bc9488fb5474032c9b..a52d47d5033d081cd555a19c18dddfc001e458f1 100644 GIT binary patch delta 2446 zcmZXWc{mi@7srR8!B`v0P7*@IFie;sgEA>ZArU3TsBD9mW*CiKVUnFF%2u|Lv>0m! zL)NlR7=&50@iOYg@Av%PdVcr*aqfAZbI)_1`}y8`&TXkgDIr@lkVhQAw>3@b5UD~( zfZN78e8;@ozhjts_@se{$&m5giiOu8R}xWbuObsnuZh`T;SsksomTSe=Y_q%dRdZvdZWy1^m9k`2|3Y1 zn3w`edv}y>NL_J|Xwz9Ib{KwDBw28Hav#a@z zV+ZD6lxNJ1b!9|koH;rWa4@K|C~fBBr4;i(tR&A^j34h%AD>O_JDI4DbsHLFSOYdh zJRxUL^W*o|k(i6YIFoU(U&{gd`!X_+p$w|9zL}DQx6l(W-TmMga~|YDUx}xhrymsN zh#4f!puj!ns^#gboqBRz;p$Hxi~EQ#p{e@b{6EWDR1$rnia|p@4U`HIq%hK&2<>W{ z@@9kX8oZhQ)=t+p{MyjO6QPxVsjt=fe$^hsc1SIQuIIR`+grBMi+#Z}9kNR{NZ@ca z;|oK(unQNx87K>%vH~;q-WS}9Xop+Rr)R%7^-;Mq+)bcih1Jj}R)6%H!v@g;;#<_+7KzZQ^@C&S!>%|7IDt{2DA zP7UMV_MRvjuv1DTTy%sFoKD|+1kH<{#xE1~(r)}+Bvo-zTi(KZrm9gu!OB}bLShxk z%IMet^@fxXDPt+Y51) z^(}j_<7(NLWZAaq=u=)k--y|ZM+5zHOR`d9h9o4Lrj1rMom5w5T6CDYOBh32e*83Z zNM$p!8Yk0gf~hr<2z_^jY}WLg0tai20m8dk&{cT9WNqVDUWfaCgSPp(n$DR&J?f5)yr=@S*uFh%kt| zg@G6^Jijv@d!gorO7JRi@Ylf{qE%vVd^X>qSWFFm<2WQ6jSX49>XP|Hbh+k0g*Mnt zC+##yzA#`Y@T)_yHFAGuNQk9=MUfkks81+HmgU+iXof9A2xdCtT_;r4O-`Wlp=Tv7 z>Zg5m^(yW32;=cpuTzYe0=IOL)?-0oA8w!29^I&2&GXO}kiQAu9AR-zwl$0o%arGx z%df}h6|k-$RyZB23N>y&u-v0X2@p}K*%a@N%7vz?o_EPYx}{z}u3Ld-UEG^PrDOA# zp7zy3~fV2cm;F?6jQd%(T{K;l8vCd=N>5{4ePU7+#e$O*c%?3I~x-``3rq0qT z4H6y7!EpNq&uy-IvVn68WSZOx(@=fIxdS~j>RIRL+4N==Lca6mFOn}K0R^-{*o@PB zn#eW?nehhBS+Oc=WUr;)Tn^`Qp8tmqeN1jtfa|Xvx~50uA{w{op7=ky1|S&TTc*+} zfhZs!@IHr&w=gs%K@At_g4QNf9e3|S_oH%bHl~c%fE>H&+F%jrvY=7z6tch_aI#M+ z$ilHG(OGYl4N;Zqy(^-$T=HsG&3gvXUTWPM>o-`wZZg83xNZce-s%fGmX2C2o_)C{ zVyMa^yHxGs@KO_VdPLC>vIno?y3G3CLZ_172TkTxF#qx%$oaGoJ$ceXfl@{f#V#PA z9|u)R*!}*UGEN=?E=y8by@ZS!H|0f_`Gh{1Vd6rA^pbT)gS5ECLCun9M`iZNV%nRB zrO#tzn31%sp0^gjp0l<@+TLxQf1bVknGFB{B)4wkzdGObpMpmU;Dh0>^~3z28NrM* z?g*YXgVq`$(6p%MM60tL)i$N{M$Y77rL%5M4wHnm<{Y+VgVr9jk`_6$QQ_2^)WAvn z&-EX`CKWBn5lgz|BUZQ_R@XK#T{fvi9p)(N5vD$0lX2{F?`s0hCjB!*Baj(j$oBV7 zTX2$=@PF2*AVeOziobSAy4?5Hck-_sW5q%2H0sf)v2t8aeatNil^gaR^*|Wx2GM_^ z^-F8eqh2 zl)zZ<(E?0Bb3#ybnWI?LJd0na<{^s})BJ_lc<6ZCy_T@?HwDQO9$qPJx>A&^dk;_+ z#nT?{UTvCZ!e8=Cv?%GXI|&6p$r2jSgZ8uK;jqvUnFuM|#23j|S#8g6?+PE5s?^ac zUXdGKf@4?P^PN&fItWJWcsm~- z=>}MW+Z0H01IlXHqW?%^{`=d3Y$@m8p-G~Gl@zv9{;n$7e*?BwY9tXs4aM!4-;erd Uj3*x{icg*tDk!?kO<;TXKP0bYLjV8( delta 2444 zcmZXWc{J4D8^?#S3}fGkF<*N!!q{S%8f%6uja>;%BxET|mQRT+Sz=Nd`&P!5rDV@g zA^Vb%QiCG0lRdup{m$>(_x$et3| zG+$f6n29^=)I1IsYk2H~f?r*!NLT;fg~Y6{P2ieDd`tQxl2!jsPYNgkY9xIQB7lTkSG(d23A$=aTcC23wj1xLvuxftcVT_oOgIO3PYo zAJ6%+;CM;vq6pXMZ)0?-zFo%qguOs1%Qg8P1~xtQlzK7FXG-GSCDA&=tCJ;Zt8pgT zu5?w68gi3LvywJXToSacNI;^(PH(%CLzkw4x5`gfF7o_-8wbp~GoV`Jr*^I7<7>TK@!0PtPH$t>^As| z&9gazS#RbJk1o%-XbTDHNN0#{?psWFrPE*Jta+kt;-0~GKKlH2ld>) zhmuD*gq`g+whe6=+d$iwZ3C`FZy3n0g}ZxP2!cBi@P)Nx4fjIpac2T`^!#})yUG31 z7p9PR#jhQwR8>C8SmHY>iikvA{(=r9Ia$Iq^+Yk`>!Meb+y@xO;#&a7rsE-0dgeQ|!+tCDl7$5qw@=QO1JLHYzWBXJe4 zIM~}2J2WXb_|`7r%JO&`{z`Z1IpeD}>hCK*%XZEhu~3&XHp5B?o6F+@_FZ+?*aCz3 zYkZr|Il7iOGWhVaqN-`t1VjuYJc`r(%$$x*NUdJ$0w*ZD_`mvc*T`d^=Fq^)kEK2r z(11YF2PXd8z*F>6z$dT4(>&>uScf)65}{7{yM-XF`x&Dl3nm}VWbOz^yaf}n!8=K{ zqiF1sM>NF{wQPd=Yq^9%o-~J_wR^FlF^76CgYmx7nevK2~abpx5LKh?kV~loU z+Wj&u-{MTZDOuaPSK3Bp^+xhVEE+g%dOGYc!P!Ht{nurO1M3^VBG>sA7pqTRTrZut zJoH7dQFFaP6W9uJ-KdyG*X=*pT3Lc;Yg?w@EG=kIN&8ai z#X!>K$x@15(Ff^M=C#hg=}%Mnh^$lU5oAFhe~*+v9~(CZ`#7)10_BUpb(iuQzI?Z< z7tXySl_gc?qe7)>WU($de6ghKLQ<>xSTohOy7?x(Z+kj~Lf==cvLBi|(y3iicVMpZ z|CxIoB1AA{6b1}j@_4ZoW@H`tTgYs9G$Sc`g0b-BniwQ)?PY^RX#bVLJvH_{5b$u* zW2}`$v$bb#qj#GBw#y611@ja)WPH@MunFa967%VZj5vN_evh#>iSr~n@6ubAulY6b z=76+8Er$ksYVu~&LrmKKZ9hzV42%?1fSnwzyG@O^1)g|Uyb9(+RBy0LS1kkvQ8Y6? zv)mJ1^B3Db{Rr`VTz?Nqzk z5w1g2fs4d~tE2dr^Rt~cPbQ$PN@S9HgiVGzG_MM$%i%Sk*{Fim_p|Q@B*O$`Ho?2* z6K8LRtu$**YfqnAL<6BaG*mWu?om5FJN)9UyxkjcekHBAXG;BS(d8Pv(0(j^)$~OI z)wEzi#4vQB^3+ntuCirJpYNLwUO*q6H9ivHvlV;JHO#nwedR%U<>P$W^V^){1|L7; z!a0N!t4g4yz|u9FJ3m*Rn@7@TU7Fb_g45mgP2jJc+6|M94KKFTD|zQ@Rfs|cor$_D zeNd@F>VLr5VFvkVg)yKAOf>ezVMa3J7dw;%gCN%G=AMDlQ zH1}DXW8Y#7+nk^3roT5Q1&%!43VGBXY8k%Jj~blSO|Z;)5??7t!K}jQ{R0D_A%bCJ zD*_FvoITd3NflHv0{+Ru-UQSn6S{S zc~jltKzDw2%gO9hph{tkQsdxXPJ>q z2f5Bsy&_0Kwc&@^pP!%50T}-b44B{m7A9mvSws(oe?BDce^dvnlY~yF*pcQ>x`h9w jktMLOoPZqeb9iI|nuU)R4V1%1291Kp(hvL5h4(3v_ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar index bd34d7a66aeca78eedfe7493f48a9ff990e59271..7523ae2bc0fa55e9769c661450990e3961af7a32 100644 GIT binary patch delta 933 zcmeC@p2E!=;LXe;!oUH94qNOd@>(&2D6eWTbwUA5y;iD!>m}_dvNt{5eol`0Nw-hR zVmh~-R-2k={Ag@4n0RCT7FEGNi$&5Nhp4UF{lG`0hHw5c`C0~fFPY#j`*+tL-Yb5; zlfVCaeP>3qnByI-vnBW&D5b>0dIhVSt`arh zj^2L5%{^hOd+otJQ$CkR%HO$tNA$%9KZz}Fl1$se+J8sBT`?=x_sT-OIlInPghkb^ z?Av;=a$%fY(!FMzPjg$hJV@F3H)QdRRJoI?y2Z7q;>d#MitPOVJWaSJFT_htV+R5$e5oWN$ z#KCiM$ExMNyQcWg**fL!m-??Eoy_(P@~slfLu4%8Nbmh_vf23k_4o4jjC&3!I~~@1 zy=!kwR5Yug*|JYwWyP6#yXPMdHZ2VO(UP$$=6iEd`6PukwO6iX70;acw5I+UM`C@w zsg~(73zZ2;%_ug%Z&{KOgSI;wjgNfhys~*v3^CWvG z_lZCE-u}PJ{n;yfaZa1Q*2j;SEl(S%AJa{<*5>PYZXU5e?k2y)?CnZs0>xi1CVmMx z>b!3Do2{lZa^)V%-FmLj{rg7R;yICz!^1Na{xE|g?#GD|fvLbq6Jr8J93ztm13Xtv wj%Bd`$KVVWdoX>A#efqSqt4*So-E920_K5Dm>j?=%GfYDja8W~n1uld07h1!u>b%7 delta 946 zcmbQj-OtS%;LXe;!oUH9VoNM0@>(&2D6eWTbwUA5y;iEf?WOD}u-4dk?nYz3Yk{8x z1XDteERYCjah)I4`8``{pN3Qa?H0ddavQ9FKS_Uc{Y|s{1NW2P+>W&Gl3nF@b>;W| z{rN6iT#FUnO(~U4^br+yFn0bKUFMa^Hg|Q>ig__UiW;(7*DXWeaVIS}`rhqj``nUU zM#A&Xn=F&Kvg5+Fta{@Yvp#-)cA{~C!`H3fex_uW^G})kf4SZ2n3ZQ8HP?QPh!y+g zw>RRv&@W?K|1aKFoWC|-JhNk0&5xNTGi7JA?sZzfk57-k>0;#jut!zPUwyxGYSInA zLuv633U9w$Fuj@8a~AVykBd(QxZdN;^W%!n z^X|UsHaL;AZ_fMX&2wWL#qtf!swXd&USs~CKJ0z?}boS4GHRXrSf}BT|XMb6^FUX8vs(xjG{C5^_5=)L# z5C3JOLsL@CUi$phpXXEaf%%Wd^7k+b+ej6urC{x8G7~oM@C%!L}Zwy;l1>473Ufs+$_Jdd**F^iRkT0ViOBQUl>%a zNbY@YRBh&cX4?0SP2a>P9M!sZb48ljk5(>UmwIsAG0Co$od%3IF(y#lF*1oTz_Zlk wBo+%$E}A@-#U4!GXEERe@}0r)Jz0X)L>|OLHbH;^8B|TqW>seMV*!Z)0N$#o-~a#s 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 1a0755379e5..26611bce03d 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 = 7; + public static final int VERSION = 8; public static final String TRAIT_IMPL_CLASS_NAME = "$TImpl"; public static final String TRAIT_IMPL_SUFFIX = "$" + TRAIT_IMPL_CLASS_NAME; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index a3a9f345e95..6759ecf63f4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -21,7 +21,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.descriptors.serialization.ClassId; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -192,20 +191,7 @@ public final class JavaClassResolver { //TODO: correct scope VirtualFile file = virtualFileFinder.find(qualifiedName); if (file != null) { - //TODO: code duplication - //TODO: it is a hackish way to determine whether it is inner class or not - boolean isInnerClass = file.getName().contains("$"); - ClassOrNamespaceDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, isInnerClass); - // class may be resolved during resolution of parent - ClassDescriptor cachedDescriptor = classDescriptorCache.get(javaClassToKotlinFqName(qualifiedName)); - if (cachedDescriptor != null) { - return cachedDescriptor; - } - assert !unresolvedCache.contains(qualifiedName.toUnsafe()) - : "We can resolve the class, so it can't be 'unresolved' during parent resolution"; - - ClassId id = ClassId.fromFqNameAndContainingDeclaration(qualifiedName.toUnsafe(), containingDeclaration); - ClassDescriptor deserializedDescriptor = deserializedDescriptorResolver.resolveClass(id, file); + ClassDescriptor deserializedDescriptor = deserializedDescriptorResolver.resolveClass(file); if (deserializedDescriptor != null) { cache(javaClassToKotlinFqName(qualifiedName), deserializedDescriptor); return deserializedDescriptor; @@ -234,7 +220,6 @@ public final class JavaClassResolver { return alreadyResolved; } - //TODO: code duplication ClassOrNamespaceDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, javaClass.getOuterClass() != null); // class may be resolved during resolution of parent ClassDescriptor cachedDescriptor = classDescriptorCache.get(javaClassToKotlinFqName(qualifiedName)); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java index 9c057e96c8c..8cfab0592fe 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java @@ -19,11 +19,12 @@ package org.jetbrains.jet.lang.resolve.kotlin; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.descriptors.serialization.*; +import org.jetbrains.jet.descriptors.serialization.ClassId; +import org.jetbrains.jet.descriptors.serialization.DescriptorFinder; +import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter; import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; @@ -95,36 +96,17 @@ public final class DeserializedDescriptorResolver { } @Nullable - public ClassDescriptor resolveClass(@NotNull ClassId id, @NotNull VirtualFile file) { - String[] data = readData(file); - if (data != null) { - ClassData classData = JavaProtoBufUtil.readClassDataFrom(data); - return createDeserializedClass(classData, id); - } - return null; + public ClassDescriptor resolveClass(@NotNull VirtualFile virtualFile) { + String[] data = readData(virtualFile); + return data == null ? null : new DeserializedClassDescriptor(storageManager, annotationDeserializer, javaDescriptorFinder, + JavaProtoBufUtil.readClassDataFrom(data)); } @Nullable - public JetScope createKotlinPackageScope(@NotNull NamespaceDescriptor descriptor, @NotNull VirtualFile file) { - String[] data = readData(file); - if (data != null) { - PackageData packageData = JavaProtoBufUtil.readPackageDataFrom(data); - return new DeserializedPackageMemberScope(storageManager, descriptor, annotationDeserializer, javaDescriptorFinder, - packageData); - } - return null; - } - - @Nullable - private ClassDescriptor createDeserializedClass(@NotNull ClassData classData, @NotNull ClassId classId) { - DeclarationDescriptor owner = classId.isTopLevelClass() - ? javaNamespaceResolver.resolveNamespace(classId.getPackageFqName(), INCLUDE_KOTLIN_SOURCES) - : javaClassResolver.resolveClass(kotlinFqNameToJavaFqName(classId.getOuterClassId().asSingleFqName()), - IGNORE_KOTLIN_SOURCES); - assert owner != null : "No owner found for " + classId; - - return new DeserializedClassDescriptor(classId, storageManager, owner, classData.getNameResolver(), - annotationDeserializer, javaDescriptorFinder, classData.getClassProto(), null); + public JetScope createKotlinPackageScope(@NotNull NamespaceDescriptor descriptor, @NotNull VirtualFile virtualFile) { + String[] data = readData(virtualFile); + return data == null ? null : new DeserializedPackageMemberScope(storageManager, descriptor, annotationDeserializer, + javaDescriptorFinder, JavaProtoBufUtil.readPackageDataFrom(data)); } @Nullable diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java index d63603f1dfc..62ba337e761 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java @@ -120,7 +120,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { ProtoBuf.Class classProto = ProtoBuf.Class.parseFrom(stream); Name expectedShortName = classId.getRelativeClassName().shortName(); - Name actualShortName = nameResolver.getName(classProto.getName()); + Name actualShortName = nameResolver.getClassId(classProto.getFqName()).getRelativeClassName().shortName(); if (!actualShortName.isSpecial() && !actualShortName.equals(expectedShortName)) { // Workaround for case-insensitive file systems, // otherwise we'd find "Collection" for "collection" etc diff --git a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar index 5d4aeefb60411cc4c499c5f706ab2c9345940b22..22d2c988d22fae02418ba80e6e76f5e14f324654 100644 GIT binary patch delta 533 zcmcb>evzFwz?+#xgnVz7Y`lwp(n}69sVD84fWwN(b{X7rG zOo$GhaKS_#1s=RyP6an_MBljbHSD7pXXpKc{~xp*X_P|cq4wTrw``+We>^olkE)Tk2^mfY8^gBs8=bxX5-};B~ef-P9#k;rq^;ss*^=>&A zlD;USW2?|;^diFp2jrWY)+oZodVEZU`bzR^!yEX}{ zdFq?4#`OaWH Pllz&i*^UBrF)#oC#{}s- delta 532 zcmcb}eu14gz?+#xgnVz7Y`lwnTn=R}pvbWsc`sUqRxxS`f z7wRm%;WEjg_Jd;3Otz`lIxcv53CgRT+~T)u?#h`f6@FO%k+7~O#5#G7HhJndDH=N3tUnhC_(98m+hsE0^H@)T5?|HkW>)tVillSE3eSgP0 z&*b(|&u`xrT1J%j@0uO>q3HeP+Wh~GmUdj*zD@jjR?NMoOE>5Fi|W8R#`Rwej;Ux1 zw8ypm)cj@hdGdtKN}Y$EGv3#jA^y{KT6}>%&o)W-x=RVM_jX?V9M!KiSBASSO-(S& zJx%M>#t02V&8M%qUd(!YYf1VluPFEHw^n*vhJ^)A&CZ=uP_m+x$!1fF&!Wk;k5m&{ zwrk#AazJa}m43CvDrE=eNwY5RKO23-AyoHGP3zPD?1%0%%dNRCaai_|>8iVna-K32 zMbt89B)%07@Mh;QD{7s$fRTYgiHU(Bz?+dtgaID0ldmvYfZ}p8KeIiU4rDgt1oEB1 QdL~a`wq`p5)WyI60Mg0rO8@`> diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar index 37b7d3b6c61064167bbc4905d9a938c7724a3ad4..65814ae7788918cf97713a9e665648f243580082 100644 GIT binary patch delta 1050 zcmcb^*T>Hr;LXe;!oUH9PFw6I@>(&2D6eWTbwVCYy$Y@m@Xf#MATnqA4i(+jX$-oJ z%tEIW_a|cb^V-@o*%7n=wZE6?v(jj#^3Faa{I+_`yN_dpRs3OS&R5&R_p)H&w_HZ{%;KZ ztSVjZcq4dY-;HNh#=bAN`DS>pzpTLF$9eXjX9#oi!3RALz8+?JIek)D?wq(y@As{X zm>v0Sf4ca}lC#rKtx~n#w&=a&O(75O)~(kHENs-@eA7{1W1f>;VIs9xvHs1M!)WpL z^%tz`mzKBulkm^_)fw_w@9zqxtY5ii@*!NZ=G$7gMP)sRT)9R0)r69k>Y%j(Z|?_q zvvchHW4wAgBLl;3CI$wS=-j-IDT1-SIOJczGNFyOg*N+)ie~Rie7gF~e);|P>~9F< z&lY~ZJ|_3cx^K7nx$4*JPYVuR#kSnLzdZiW&TIFqD@3Ntr`>ydH&3=ytm(P__vnwO zE^n>+vn=xV)@%PF?&r!KUw!Ca?dFwdVs>8R`*1|FEaYY1(dIir)mPT$$e#aGQ&(x7 z9obfYe76wq7T(Tz=Y77!9Bc`E;Cj&J+=={K%bVVq>IqyomOTDdRjhZ~V@18qlU^3A z;kbQbc2o6!>0PCj=hw}%K6Pax@1?C*WA-#u%AQJ?`R&jZj_V73 zK4le!R+sv9?#oW@DoFa;QpaBYIeN}#=Q++6vtCNRDJDAJwGxa^Z_a79?-TqyFKLcZU77Hkr8JR>F z;MsQaS5^y9PMvJPW)G%|*z|dUd}nydn7ocHNggDEY>Eg2GI%^$pIx0zf(;}F041>R AzyJUM delta 985 zcmeC(&2D6eWTbwVCYy$Y_M;O)<3C~$na&69`BE=LQD z3}rq%Vl(-8Ad}Jant-a;j_IiitxHvxdVfi-{Q7|XgR^A1yo8U>mXlvT=GXt9`SSSl z+tv&w3(hP!>Ao(t|BhYx^O~-!Q_EH}Z+-JnYHzjb+@nF6&5v)VU;g@Z@~5rcS2^9+ zJbt3a+~Zhy?E0NgJLc3!@h_I#rN->Z_Po9#<{WRc&QrPD+hWrvtcm4GUU)UjRANb% z--0Vu#wOFgEfwV6a^|#9>l}^Od}k+A+kM;ljN4?zY!{DPMhQ)aI``gs`%SbtCUkLk zQm@rC>$&Gln@i4e7B9J#<&&^-dCWWBonkdl9xBXO(SKayYrq;7&ig-eH0!56bko?G zG@-xh6&L?Q0ig*^2}>3*Sv%CTs9L>sHo1|#BSeAQvPvpuF6*afT?YlvR!?-uJ|N4^ zRmxh~byswysKpQdxF4eW0&zUtydSu`j`;79;WXU0vboi5d1vn8wUZ>~wD`T$5AbH^ zNanNtk;=%x5XZ#80FN6MP~>d>z!bq)AE{NZ5!`uWo`qbzH(oWd#}+Kjmzf=4igTtm0E^`i$aP>YI9=A3e;QxMR@xb^H6o`F)W2^WAcJkBeSzbhw`)<1DTHMtHuSNk={ZOWXBtTPEI`-SbP!a>8H5 z$Y(c@wXsho6^CeRYEE<*h8exC49mQaAWiCuX(04p6H! z-MMP7)pD2nTMb=zcvm^?Z{Gb=_uNm#bBZ!&zwmr-QMr7vd%NC)YvT6~U9o!na&n%? ze#QGK;U~kZ(gJq3%=}>NId_-Kt+#x48h7V29xr%b4~pinbqyVp1=vJD8EmpTn+2Fo xVzUR+OW5>zf#S~av@rPrTar9T1f=aVFlEeQVPFtpKn5EpC$g)vJ!1ul0RZs<#GwEH diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar index 5a6d86533bb9bcb9f9d27ee7d21243cd9bf09b95..2958dd9c039884fb633842144aeb8e018f9230f9 100644 GIT binary patch delta 1342 zcmY+EeKgYx7{|9|BVkL6R$t)? zUvvMuRrpZX(1l)u*dOpelp=CNoGaiN@1k?TVGxFoIb$))E6ms!hpY6yq-I%jmf$3c z3nHQF9P(El@lwZCWp@yh*D8bEnfb9K#cYcrcIi|7yemjUmL`(iaZ4n$dT00#WGItG$odd4wmhp60G!d}A zx#cA7rU>e!{Oe<2Qo^U~5V?uIqP*cA5!LulS}d!NRQk5aiiANl8`^y%1!!t8+QDrS z2DH!GWOm5$S@hT_`$(zeweq=D;0(*UFa&!#(QC}M$t15x<9JAY%KHHs z#ks{m3M{twwd=>&8lJAkSN3`1>n3j0=g?(hYz%59VuMUzz1x)hs(UBj_wbK4Pudr_u|x>N(_0+CTLX6#j8hlf-snhikZ$l<#Pd(?gJt6 zgVn2SyS_Fg>1uG+S6he$3s*k3!N(b?BUPKDPT1KFKKiueR4P>pdQ!%~k$N8yc3~+~ zbs3YH_Et0dazWcQ2yc(GQUd0kmE7}fTccErX(bPU#{xF~p_E#+REVb40?SV&sO8a$ zwjwJJnmK9jE}^A?x17KA#fk@oyUDIeSs87ygFVnw6uKR8r5)r+tZ=V|bCalgm~!j& z3*SFLH^?#XHjLT}83cB*sN@pPMp-?N%ZFpyN8*E>k6<(&>!kp#kz_I%iYc-F%s)wiRC}9lJdonoAYtr!CjroCojYkyIQbZd|b(WYroN?l~y%*^0VfVPaY1y^zHc^YxC!0oSsci zC;iWQmK!L#6>oeamvpM1lasw9NJTYPhK$95on%toRUJ&^7I5(|74lV9bto8ys;{{R?6ubVmRH delta 1297 zcmey*cZQEQz?+#xgnV!O)dKFMVA==x?QQ&y`o+nGY(^7w^ zwD5nsq-e@fWuMa|gzC++|LnRolo zZ!c%aaFBdBZRfny-S-+Qi_Mna@~YgrFy>pP^S@@1b4i+0mlfvg&U+eF8IpWuPoa8m z7@NRCi)87vpFTco-RsNU=ACm8TKH@F!K*RKDZW=X=H9-}aq`zw4Ys#syBjC0vSwWQ zJ$;GpR zy7RUyn&agz;cFhHPi}B{*S<8YKO&O8&i`1{g$6D$8WQg64k6o^?Z-Omu<&CVh8 zMO-+Ak%1wCi2=xmMGYt#CckA;ufH2~*+Jy^`I{2kMe`DXL<_V_t z@#TA!_e-1H_>|gVa3a$8^rlZ7mz=h>ZTKiK?u+x9jo=!>vcE-X2CDCWXfr|oBp9!}SOR+V0tH@(&L)~ij-QWwm)BR8D1w%O$P-*PuCxvt{FL z;Ws}MPk;S&|9HD==H0a$7d-wo??`=NOMm{Q2}*gaZb5VNXR}62Nt_a>zG!c?=GofI zPS;nsJinE;ZQo{@-(Qpr#f)?x$N25PbH94~mf&@HKayX6dj9Fmvq-~@KMq>o+mUwb z(z!dHiC=?a=l0iUFs~Axd++A;V7}9~;<>3)>Y2zd(_fy#)xwIzjS&>#+azSR#T_#H+vOdk=SydJ2-ZX28^!}eQvo<|8|C!1+J*I!^?zdLltG3*G zH1Xo3`wP}e@y0y--n{bgJcq2j<4+r{LnG!rZ#Q`|{mR4eYnSh3hnLLYw|*zu#K)2% z(9g3>KwUv)r#bIl_kE2E*WdZHv8G=3LD(B#MXP(7TE%z7162!|7cZLPFl+tBI03hW zp4-3AN=_8Dm8x&I-g8Lg(;x1o#=L#5cOqw39tC`7m2_9e8f*i zM1G?B$=XkQjfH3IZq@uSC;Fn**}XHBY+7#yAK5qf;ALbI zVStxblcm`#z&Rs~%^pn8VAJOX<`idmCYpSOEnXfZf^3Wk12R}UIfz}I?ItTo3;?!7 BOt=65