From cb6c98d4d658c55a299b40f6ef84edad831e74a2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 1 Nov 2013 19:16:21 +0400 Subject: [PATCH] Delete OBJECT_PROPERTY kind from binary format We never create properties for objects anymore, except enum entries of Java enums. Delete PropertyDescriptorForObjectImpl and its usages --- .../frontend/builtins/jet/.kotlin_class_names | Bin 768 -> 768 bytes .../frontend/builtins/jet/.kotlin_name_table | Bin 6077 -> 6156 bytes .../frontend/builtins/jet/.kotlin_package | Bin 291 -> 291 bytes .../frontend/builtins/jet/Array.kotlin_class | Bin 221 -> 221 bytes .../builtins/jet/BooleanArray.kotlin_class | Bin 135 -> 135 bytes .../builtins/jet/ByteArray.kotlin_class | Bin 135 -> 135 bytes .../builtins/jet/ByteProgression.kotlin_class | Bin 120 -> 120 bytes .../builtins/jet/ByteRange.kotlin_class | Bin 148 -> 148 bytes .../jet/ByteRange.object.kotlin_class | Bin 26 -> 26 bytes .../builtins/jet/CharArray.kotlin_class | Bin 135 -> 135 bytes .../builtins/jet/CharProgression.kotlin_class | Bin 120 -> 120 bytes .../builtins/jet/CharRange.kotlin_class | Bin 148 -> 148 bytes .../jet/CharRange.object.kotlin_class | Bin 26 -> 26 bytes .../builtins/jet/CharSequence.kotlin_class | Bin 59 -> 59 bytes .../builtins/jet/DoubleArray.kotlin_class | Bin 135 -> 135 bytes .../jet/DoubleProgression.kotlin_class | Bin 120 -> 120 bytes .../builtins/jet/DoubleRange.kotlin_class | Bin 148 -> 148 bytes .../jet/DoubleRange.object.kotlin_class | Bin 26 -> 26 bytes .../builtins/jet/FloatArray.kotlin_class | Bin 135 -> 135 bytes .../jet/FloatProgression.kotlin_class | Bin 120 -> 120 bytes .../builtins/jet/FloatRange.kotlin_class | Bin 148 -> 148 bytes .../jet/FloatRange.object.kotlin_class | Bin 26 -> 26 bytes .../InlineStrategy.AS_FUNCTION.kotlin_class | Bin 0 -> 15 bytes ...neStrategy.AS_FUNCTION.object.kotlin_class | Bin 0 -> 13 bytes .../jet/InlineStrategy.IN_PLACE.kotlin_class | Bin 0 -> 15 bytes ...nlineStrategy.IN_PLACE.object.kotlin_class | Bin 0 -> 13 bytes .../builtins/jet/InlineStrategy.kotlin_class | Bin 42 -> 42 bytes ...neStrategy.object.AS_FUNCTION.kotlin_class | Bin 13 -> 0 bytes ...nlineStrategy.object.IN_PLACE.kotlin_class | Bin 13 -> 0 bytes .../jet/InlineStrategy.object.kotlin_class | Bin 89 -> 55 bytes .../frontend/builtins/jet/Int.kotlin_class | Bin 1548 -> 1548 bytes .../builtins/jet/IntArray.kotlin_class | Bin 135 -> 135 bytes .../builtins/jet/IntIterator.kotlin_class | 6 +-- .../builtins/jet/IntProgression.kotlin_class | Bin 120 -> 120 bytes .../builtins/jet/IntRange.kotlin_class | Bin 148 -> 148 bytes .../builtins/jet/IntRange.object.kotlin_class | Bin 26 -> 26 bytes .../builtins/jet/Iterator.kotlin_class | Bin 53 -> 53 bytes .../jet/KExtensionFunction0.kotlin_class | Bin 62 -> 62 bytes .../jet/KExtensionFunction1.kotlin_class | Bin 88 -> 88 bytes .../jet/KExtensionFunction10.kotlin_class | Bin 322 -> 322 bytes .../jet/KExtensionFunction11.kotlin_class | Bin 349 -> 349 bytes .../jet/KExtensionFunction12.kotlin_class | Bin 376 -> 376 bytes .../jet/KExtensionFunction13.kotlin_class | Bin 403 -> 403 bytes .../jet/KExtensionFunction14.kotlin_class | Bin 430 -> 430 bytes .../jet/KExtensionFunction15.kotlin_class | Bin 457 -> 457 bytes .../jet/KExtensionFunction16.kotlin_class | Bin 484 -> 484 bytes .../jet/KExtensionFunction17.kotlin_class | Bin 511 -> 511 bytes .../jet/KExtensionFunction18.kotlin_class | Bin 538 -> 538 bytes .../jet/KExtensionFunction19.kotlin_class | Bin 565 -> 565 bytes .../jet/KExtensionFunction2.kotlin_class | Bin 114 -> 114 bytes .../jet/KExtensionFunction20.kotlin_class | Bin 592 -> 592 bytes .../jet/KExtensionFunction21.kotlin_class | Bin 619 -> 619 bytes .../jet/KExtensionFunction22.kotlin_class | Bin 646 -> 646 bytes .../jet/KExtensionFunction3.kotlin_class | Bin 140 -> 140 bytes .../jet/KExtensionFunction4.kotlin_class | Bin 166 -> 166 bytes .../jet/KExtensionFunction5.kotlin_class | Bin 192 -> 192 bytes .../jet/KExtensionFunction6.kotlin_class | Bin 218 -> 218 bytes .../jet/KExtensionFunction7.kotlin_class | Bin 244 -> 244 bytes .../jet/KExtensionFunction8.kotlin_class | Bin 270 -> 270 bytes .../jet/KExtensionFunction9.kotlin_class | Bin 296 -> 296 bytes .../builtins/jet/KFunction0.kotlin_class | Bin 36 -> 37 bytes .../builtins/jet/KFunction1.kotlin_class | Bin 62 -> 63 bytes .../builtins/jet/KFunction10.kotlin_class | Bin 297 -> 297 bytes .../builtins/jet/KFunction11.kotlin_class | Bin 323 -> 323 bytes .../builtins/jet/KFunction12.kotlin_class | Bin 351 -> 351 bytes .../builtins/jet/KFunction13.kotlin_class | Bin 378 -> 378 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 333 -> 333 bytes .../builtins/jet/ListIterator.kotlin_class | Bin 118 -> 118 bytes .../frontend/builtins/jet/Long.kotlin_class | Bin 1548 -> 1548 bytes .../builtins/jet/LongArray.kotlin_class | Bin 138 -> 138 bytes .../builtins/jet/LongIterator.kotlin_class | 6 +-- .../builtins/jet/LongProgression.kotlin_class | Bin 123 -> 123 bytes .../builtins/jet/LongRange.kotlin_class | Bin 149 -> 149 bytes .../jet/LongRange.object.kotlin_class | Bin 27 -> 27 bytes .../builtins/jet/Map.Entry.kotlin_class | Bin 75 -> 75 bytes .../frontend/builtins/jet/Map.kotlin_class | Bin 246 -> 246 bytes .../jet/MutableCollection.kotlin_class | Bin 248 -> 248 bytes .../builtins/jet/MutableIterable.kotlin_class | Bin 60 -> 60 bytes .../builtins/jet/MutableIterator.kotlin_class | Bin 50 -> 50 bytes .../builtins/jet/MutableList.kotlin_class | Bin 491 -> 491 bytes .../jet/MutableListIterator.kotlin_class | Bin 148 -> 148 bytes .../jet/MutableMap.MutableEntry.kotlin_class | Bin 97 -> 97 bytes .../builtins/jet/MutableMap.kotlin_class | Bin 296 -> 296 bytes .../builtins/jet/MutableSet.kotlin_class | Bin 249 -> 249 bytes .../builtins/jet/Nothing.kotlin_class | 4 +- .../builtins/jet/Progression.kotlin_class | Bin 76 -> 76 bytes .../jet/PropertyMetadata.kotlin_class | 4 +- .../jet/PropertyMetadataImpl.kotlin_class | Bin 53 -> 53 bytes .../frontend/builtins/jet/Range.kotlin_class | Bin 90 -> 90 bytes .../frontend/builtins/jet/Set.kotlin_class | Bin 143 -> 143 bytes .../builtins/jet/ShortArray.kotlin_class | Bin 138 -> 138 bytes .../builtins/jet/ShortIterator.kotlin_class | 6 +-- .../jet/ShortProgression.kotlin_class | Bin 123 -> 123 bytes .../builtins/jet/ShortRange.kotlin_class | Bin 149 -> 149 bytes .../jet/ShortRange.object.kotlin_class | Bin 27 -> 27 bytes .../frontend/builtins/jet/String.kotlin_class | Bin 165 -> 165 bytes .../builtins/jet/Throwable.kotlin_class | 16 +++--- .../builtins/jet/Unit.object.kotlin_class | Bin 28 -> 28 bytes .../frontend/builtins/jet/atomic.kotlin_class | 4 +- .../frontend/builtins/jet/data.kotlin_class | 4 +- .../builtins/jet/deprecated.kotlin_class | Bin 40 -> 40 bytes .../frontend/builtins/jet/inline.kotlin_class | 8 +-- .../builtins/jet/noinline.kotlin_class | 4 +- .../builtins/jet/suppress.kotlin_class | Bin 55 -> 55 bytes .../builtins/jet/volatile.kotlin_class | 4 +- .../serialization/src/descriptors.proto | 3 +- .../descriptors/serialization/ClassId.java | 36 ++++++------- .../serialization/DescriptorDeserializer.java | 51 +++++------------- .../serialization/DescriptorSerializer.java | 11 ++-- .../descriptors/serialization/ProtoBuf.java | 13 +---- .../descriptors/DeserializedMemberScope.java | 3 +- .../impl/PropertyDescriptorForObjectImpl.java | 46 ---------------- .../k2js/translate/utils/BindingUtils.java | 4 -- 153 files changed, 70 insertions(+), 163 deletions(-) create mode 100644 compiler/frontend/builtins/jet/InlineStrategy.AS_FUNCTION.kotlin_class create mode 100644 compiler/frontend/builtins/jet/InlineStrategy.AS_FUNCTION.object.kotlin_class create mode 100644 compiler/frontend/builtins/jet/InlineStrategy.IN_PLACE.kotlin_class create mode 100644 compiler/frontend/builtins/jet/InlineStrategy.IN_PLACE.object.kotlin_class delete mode 100644 compiler/frontend/builtins/jet/InlineStrategy.object.AS_FUNCTION.kotlin_class delete mode 100644 compiler/frontend/builtins/jet/InlineStrategy.object.IN_PLACE.kotlin_class delete mode 100644 core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java diff --git a/compiler/frontend/builtins/jet/.kotlin_class_names b/compiler/frontend/builtins/jet/.kotlin_class_names index 4b88f33516036201c5f61de23bc0dff075550c54..9730774eea0dfd4e95ecbd8135ef68575d1e53ec 100644 GIT binary patch delta 185 zcmWm5I}UDZZRDbMFks zV0=#Mjw15I1QQQf-&P%cFGO^S6{|JrV~c<}BzM^3fFlx|aY2fVfAeij&vB*CZ`{g; Zyy1?LIYL3NNSmxhJZ&f~Iy~`0{|C}s5Lo~K delta 185 zcmWm6y$XV06o>J17B>}gmL?@(fc`JW6q W3T_`)_Khy+6EBn^mR5`!Z+!lZgAs=S diff --git a/compiler/frontend/builtins/jet/.kotlin_name_table b/compiler/frontend/builtins/jet/.kotlin_name_table index fac9e2da4e5122ceaf8600d78e798edac10c3485..459e676336021bc2ce3fa9f619b1b6b2307739c0 100644 GIT binary patch delta 463 zcmdn1-($e|Z6o6qb{jdHfw@^Rl5Kn(UJ1%KVc~8Ii z03SzZSG&zu*q?JSPTIUjK%d$32%`i87duCSz%d9TUf?K%ktA>&CUOG8U=X+fV_bwW zE<+e>0#`Phh~zNU&td`_#~?5p#+VOdEQc{xz!<9_3<-hNFp)Jd#%2(MgJTP$z!sR$ z4j5x6jIj^KI0R$VAAzxs!WhRu3=WPxi~`4DLT6x%b1=qv7~=wraS_J23}HwLT!D#P igD^M*?!ZLu!5EY0iF0Z^fbkx}7>{9$Cosk{AOirOm`@l0 delta 384 zcmXxcO%B0O7=_{9O7vs&MTA;KZNn}sz{Cn_0cOUA1he)ggpdfWfzYPSHSw1au?I8i z=FFb+4oU#d%915|ljz6~JGsVA*hbN!CI>*MVQ>V*K%$Z76h#3i*)F$Cw{QOM z3?2YOV5DL57-a%@8HjwrKGGDJ0ZU*FY=AA`2APN!f{MuVBqY;!o?)O6UEJOO~Akf%wdV*;t(_71GA;U5)*B$0ns`LbpQYW delta 47 scmb=Zm>{OEVBqY;!o?)O6UEJOO~Jqg%wdV*;t(_71GA;U5)*B$0oCdVr2qf` diff --git a/compiler/frontend/builtins/jet/ByteRange.kotlin_class b/compiler/frontend/builtins/jet/ByteRange.kotlin_class index 46489a6ccf0b874db79347767467490f739d2e07..e22038570f596a33b263c8c9dff370f25e630ba5 100644 GIT binary patch delta 29 kcmbQjIE8V79iM=Kvl9y!lK@W?H^()Bi9QmH0uxj90bpnbb^rhX delta 29 kcmbQjIE8V79iM`Mvl9y!lK@W?H^()Fi9QmH3KLWH0b-a2rT_o{ diff --git a/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class b/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class index 8a94951587fbcddf156a8598a6aaef11eebdf60f..e095c1cd6a5175d0686cdb6239663e3e0dbb2613 100644 GIT binary patch literal 26 fcmd;RW0sINV&P&EV2a}AI3{4==>+14WHA5$G6@5@ literal 26 fcmd;RW0sINV&P&EV2a}AIHq9W=>+14WHA5$GPwiE diff --git a/compiler/frontend/builtins/jet/CharArray.kotlin_class b/compiler/frontend/builtins/jet/CharArray.kotlin_class index 2ca8847f22020ebc27bb70ed0c5e0846198b3293..6014612dab9532fbe0226b561f4426fb5c1abd60 100644 GIT binary patch delta 16 WcmZo?Y-gOH#wajR-3CacC<6c@-UIaj delta 16 WcmZo?Y-gOH#;7n+-3CacC<6c^t^^eT diff --git a/compiler/frontend/builtins/jet/CharProgression.kotlin_class b/compiler/frontend/builtins/jet/CharProgression.kotlin_class index 3f8e60afbb6316a44857a8c81a902b7b6c4a2347..a2b71d6640290bc2c662f29e04446403e19bc763 100644 GIT binary patch delta 47 scmb=Zm>{MuVBqY;!o?)OAH~gaO~Akf%wdV*;t(_71G5#u5)*B$0nye7egFUf delta 47 scmb=Zm>{OEVBqY;!o?)OAH~gaO~Jqg%wdV*;t(_71G5#u5)*B$0oH~Ht^fc4 diff --git a/compiler/frontend/builtins/jet/CharRange.kotlin_class b/compiler/frontend/builtins/jet/CharRange.kotlin_class index 0ee43f3fb2af9809e539bdc869a6e345d126da9b..ff0548bd92d932d92073490e0257ee9bf74d8274 100644 GIT binary patch delta 29 kcmbQjIE8V79iM=Kvl9y!lK_7dH^()Bi9QmH0uxj90br5_c>n+a delta 29 kcmbQjIE8V79iM`Mvl9y!lK_7dH^()Fi9QmH3KLWH0b;@isQ>@~ diff --git a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class index 926b720449deba714aca6ea8d26a9a55b0b899d5..4ac4de55f1f7d50406ad5c9ccbafb809938cb578 100644 GIT binary patch literal 26 fcmd;RW0p`hV&P&EV2a}AI3{4==>+14W-$N&GGqh3 literal 26 fcmd;RW0p`hV&P&EV2a}AIHq9W=>+14W-$N&GZX{P diff --git a/compiler/frontend/builtins/jet/CharSequence.kotlin_class b/compiler/frontend/builtins/jet/CharSequence.kotlin_class index 41321a1ac0c3a203f391fea7d30c2d34563241d1..a297a47cb04ef539c6f6db526335386f1672a9b5 100644 GIT binary patch delta 26 ecmcDvo}eZwU=ZNM!o?)O62--#W)KKws{#N#V*}Cv delta 26 ecmcDvo}ebGU=ZNM!o?)O62--#W)KKws{#N$vjgG) diff --git a/compiler/frontend/builtins/jet/DoubleArray.kotlin_class b/compiler/frontend/builtins/jet/DoubleArray.kotlin_class index 1c74994f8799b978ca4919b40cfac19579ab4ca3..2627d935717eded7ed413e8239292f1b8f59ca3e 100644 GIT binary patch delta 16 WcmZo?Y-gOH#wajR-3CacC<6c@-UIaj delta 16 WcmZo?Y-gOH#;7n+-3CacC<6c^t^^eT diff --git a/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class b/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class index 947ec762ca41fd448cfaac7516147372e9971490..9e4c014de1e2cad4fc983a8a4c258c3498fa592c 100644 GIT binary patch delta 47 qcmb=Zm>{MuVBqY;!o?&Y5XH@LO~Akf%HiS=GvEWWwZIY+ZLI;*MF^At delta 47 qcmb=Zm>{OEVBqY;!o?&Y5XH@LO~Jqg%HiS=GvEWWwZIY+ZLI;<^$5fO diff --git a/compiler/frontend/builtins/jet/DoubleRange.kotlin_class b/compiler/frontend/builtins/jet/DoubleRange.kotlin_class index b12fccefea45d24e6c12a3dc485f490a83e93616..abe416976b5560e864afb774beb976dc810f8699 100644 GIT binary patch delta 29 kcmbQjIE8V79iM=Kvl9y!lYl@JH^()Bi9QmH0uxj90brm8dH?_b delta 29 kcmbQjIE8V79iM`Mvl9y!lYl@JH^()Fi9QmH3KLWH0b+14WibE%Gc5zi literal 26 fcmd;RW0ue{V&P&EV2a}AIHq9W=>+14WibE%Gu;E& diff --git a/compiler/frontend/builtins/jet/FloatArray.kotlin_class b/compiler/frontend/builtins/jet/FloatArray.kotlin_class index 40cf79be1eb90c4d320cc73ae418acacc868be08..a0c71034451d90770146bf5aff768dfbe8c6d71b 100644 GIT binary patch delta 16 WcmZo?Y-gOH#wajR-3CacC<6c@-UIaj delta 16 WcmZo?Y-gOH#;7n+-3CacC<6c^t^^eT diff --git a/compiler/frontend/builtins/jet/FloatProgression.kotlin_class b/compiler/frontend/builtins/jet/FloatProgression.kotlin_class index 6028a1cfe588647583a7d8c3531a6fd6e67fb051..40bfa6fadbeb82d33f10ed19e041911dc1760d31 100644 GIT binary patch delta 47 qcmb=Zm>{MuVBqY;!o?&Y7{$$TO~Akf%HiS=GvEWW-M|tPZLI;+cnGop delta 47 qcmb=Zm>{OEVBqY;!o?&Y7{$$TO~Jqg%HiS=GvEWW-M|tPZLI;>C+14XE6W(HJAhC literal 26 fcmd;RW0vqRV&P&EV2a}AIHq9W=>+14XE6W(Hb?{Y diff --git a/compiler/frontend/builtins/jet/InlineStrategy.AS_FUNCTION.kotlin_class b/compiler/frontend/builtins/jet/InlineStrategy.AS_FUNCTION.kotlin_class new file mode 100644 index 0000000000000000000000000000000000000000..936cc1e93fbe0869b89b4694560095ad4eb00d71 GIT binary patch literal 15 Wcmd-$#wd}X#9+k2#Uv1)#Q*>n9|DB{ literal 0 HcmV?d00001 diff --git a/compiler/frontend/builtins/jet/InlineStrategy.AS_FUNCTION.object.kotlin_class b/compiler/frontend/builtins/jet/InlineStrategy.AS_FUNCTION.object.kotlin_class new file mode 100644 index 0000000000000000000000000000000000000000..5f3c7f9850aeecb08209b9080c2f0a0098b24ed0 GIT binary patch literal 13 Ucmd;RW0puXV&P&ENXTLU01sUPCjbBd literal 0 HcmV?d00001 diff --git a/compiler/frontend/builtins/jet/InlineStrategy.IN_PLACE.kotlin_class b/compiler/frontend/builtins/jet/InlineStrategy.IN_PLACE.kotlin_class new file mode 100644 index 0000000000000000000000000000000000000000..154a4c2857a5929755ca15976dae2ce2b633a496 GIT binary patch literal 15 Wcmd-$#wd}b#9+k2#Uv1)#Q*>nH3EkK literal 0 HcmV?d00001 diff --git a/compiler/frontend/builtins/jet/InlineStrategy.IN_PLACE.object.kotlin_class b/compiler/frontend/builtins/jet/InlineStrategy.IN_PLACE.object.kotlin_class new file mode 100644 index 0000000000000000000000000000000000000000..67a989f870c8e5915dbab4c8f65c57cacc2fffb0 GIT binary patch literal 13 Ucmd;RW0puZV&P&ENXlXW01tHnD*ylh literal 0 HcmV?d00001 diff --git a/compiler/frontend/builtins/jet/InlineStrategy.kotlin_class b/compiler/frontend/builtins/jet/InlineStrategy.kotlin_class index c49d1ffbcb5d6c4ca62f044ea16b4a2cd57e3ab1..e3d1dc800280224d2cc7718ee96281cfcd2a0c36 100644 GIT binary patch delta 26 hcmdPWnjk9baD>s}C}S2c7dOWtMgwLi7A_`%cmPwn1!VvL delta 26 hcmdPWnjk8gaD*}8C}S2c7dOWtMgwLi7A_`%cmP~lrf5jqm9Yn2%{4V7n49dgm)Cili+CMF*wd>#l^uOASeY=p$b(e V0+Knw=)?mQV-{i)0_)CV001BJ4}bsw diff --git a/compiler/frontend/builtins/jet/Int.kotlin_class b/compiler/frontend/builtins/jet/Int.kotlin_class index e4a48bc1e51ab317bad515888b51793e3370bc8e..b15e5f19f46d2a864594d434fb63259312a4926d 100644 GIT binary patch delta 77 zcmeC->EYRMn33`H<|B-Em^9BYT5)qQ2%Ke2mpZtL3 N1IKx&_~aX`CIIhQ6A%CZ delta 77 zcmeC->EYRMn33`1<|B-Em^4o@T5)qQ2%Kh=V&P&EU~vMIQ4$<%24_%ZCO>2mpZtL3 N1IJmY_~aX`CIIb069NDL diff --git a/compiler/frontend/builtins/jet/IntArray.kotlin_class b/compiler/frontend/builtins/jet/IntArray.kotlin_class index 7979962addf4644ddbfe9672c3efd2206ed97f02..86355e0bbf64769091def20299dcf3cc1bbda7a4 100644 GIT binary patch delta 44 wcmZo?Y-eQQV3SCl$f6`FV8G+V!o?)O7RANEX21t#r%klhU=)~`qQsaA0GJmC8UO$Q delta 44 wcmZo?Y-eQQV3SCm$f6{wV8G+V!o?)O7RANEX21t#r%bfgU{sixqQsaC0GbB}Gynhq diff --git a/compiler/frontend/builtins/jet/IntIterator.kotlin_class b/compiler/frontend/builtins/jet/IntIterator.kotlin_class index ddef68df2d4..2b574834e62 100644 --- a/compiler/frontend/builtins/jet/IntIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/IntIterator.kotlin_class @@ -1,8 +1,8 @@ -&d2 +&f2  Z 0B -Z &0ÐB +Z &0ÒB j Æ0B -d \ No newline at end of file +f \ 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 9658c696bccd5be6ac31b5364194a26001db9c2f..84560c0db5bf102640ba055951de6ed517e00e73 100644 GIT binary patch literal 120 zcmd;JlSnt>;bIby6=D-&0n#i{+#J^g44j>iI4)2Q7l)VuADEp6QRM`Y$TH;8=Qze_ Zz--0E!64uy1=b2?J0r1OAZ)OfbO5iL4wV1^ literal 120 zcmd;JlSnn<;bIby6=D-&0n#i{+#J^w44j>iI4)2Q7l)VuADEp2QRM`Y$TH;8=Qze_ Zz--0E!64uy1=b2?J0r1OAZ)OfQ~+1iWibE%I3)x0 literal 26 fcmd;RW0puWV&P&EV2a}AIHq9W=>+1iWibE%IH?2z diff --git a/compiler/frontend/builtins/jet/Iterator.kotlin_class b/compiler/frontend/builtins/jet/Iterator.kotlin_class index 77266f8b10ba4f01d7da1ceb18e4163bb3de2f06..c8d7cc08428d70f5ba6f5388b338af2e9cd55eb9 100644 GIT binary patch delta 9 QcmXptogmM6b)teO01cS}wg3PC delta 9 QcmXptogmM6d7^?S01c4>v;Y7A diff --git a/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class index d760f0d2aab5a263c28ec619fd8cffdaa9714233..a20b21d34d17973264385bba9893ec61ac678b76 100644 GIT binary patch delta 10 RcmcDsW8p}X$ehSx1po_i0zUu% delta 10 RcmcDsW8p}XNT0}J1po_a0zCi# diff --git a/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class index d08404f7f81dcaaa499aeedf5517cba49fd4c9e8..ffaeff706d46953d8e7cef30cb4d8fa2596fccc5 100644 GIT binary patch delta 10 Rcma!uVBtuU$ePF!0sswt0*(Lx delta 10 Rcma!uVBtuU$e73y0sswl0*n9v diff --git a/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class index aabe5dd5f6a85b1d6b1317093eef69c3e7f2edad..979ea15da5b40c3e0c6b4f1ac04a2fd77e179cf3 100644 GIT binary patch delta 13 UcmX@abcl(CBTXWEBa0m)02_+~asU7T delta 13 UcmX@abcl(CBTXW6Ba0m)02_e=Z~y=R diff --git a/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class index 997fa7a7a570a6b3c00a39425bf82e108b8c6af2..f0003a303ea51db191d8342f7dee8619646c5585 100644 GIT binary patch delta 13 Ucmcc1beD;RBTXV_BTFPB03J>Q!~g&Q delta 13 Ucmcc1beD;RBTXV}BTFPB03JjG!TBTb@kBg+Fu03b62U;qFB delta 13 UcmaFD{Dhf>BTXWIBg+Fu03ay@UH||9 diff --git a/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class index 45ddc82d3b17d0073c431c64f19c00a404992556..ca12cd8af08c8d6d3d12ae2355833190886b22be 100644 GIT binary patch delta 13 Ucmey*{GXYHBTb@cBg=0_03!ATvH$=8 delta 13 Ucmey*{GXYHBTb@UBg=0_03z%JumAu6 diff --git a/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class index 01d198e26ba746fc2dfd8081722beaa6fea901c3..ab4cb2eecf4c95dc355bd3e16d2f4047621571f7 100644 GIT binary patch delta 13 UcmbQmGK+a)E_~BTb@gBa06c03BNctN;K2 delta 13 Ucmcb>a)E_~BTb@YBa06c03A^SssI20 diff --git a/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class index dd6e46d5c68bfc7eb36345f5e18713672ac61b4b..77781c07f06d05ee6460070f97383cc256329ed7 100644 GIT binary patch delta 13 UcmaFO@|uN(BTb@wBTG6H03aR%{r~^~ delta 13 UcmaFO@|uN(BTb@oBTG6H03Z|t`~Uy| diff --git a/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class index 6131b3a4a81146b750f4e8e3d5b2afcef8c180d0..b94ace63e670774de7d4c398aacd94ae37297f46 100644 GIT binary patch delta 13 UcmZo;ZDVEONRz18$kN0F02cQHQUCw| delta 13 UcmZo;ZDVEONRuer$kN0F02b{7Pyhe` diff --git a/compiler/frontend/builtins/jet/KExtensionFunction3.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction3.kotlin_class index b10bd4597b28d8731ce02a3b5efd928db33ba972..a852a017529cff18c485af2a4f05f98e5651270f 100644 GIT binary patch delta 12 TcmeBS>|tc#NRz0X$kG7-6N3Xg delta 12 TcmeBS>|tc#NRud^$kG7-6MF+W diff --git a/compiler/frontend/builtins/jet/KExtensionFunction4.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction4.kotlin_class index acd90c1eefc18e3310a31500838522538fc566c0..6276679353de1a064d8d25bb82b6d518c86de481 100644 GIT binary patch delta 12 TcmZ3+xQvm7BTb@eBFiEG72N}h delta 12 TcmZ3+xQvm7BTb@WBFiEG71aZX diff --git a/compiler/frontend/builtins/jet/KExtensionFunction5.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction5.kotlin_class index 69252545a6d5120a48aae378ca45b38f171a3fc2..7cd37c44775f016891da27bd7cef9caab777d6e5 100644 GIT binary patch delta 12 TcmX@Wcz}_GBTb@uBFi2C7&imi delta 12 TcmX@Wcz}_GBTb@mBFi2C7%v0Y diff --git a/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class index 7ef9923b758259be4c713949894b15e84beacafd..cb8c880edd7d274e5f0fb4483153e19c5ff4c346 100644 GIT binary patch delta 12 Tcmcb`c#DyRBTb@aBFi-Z8j%Dj delta 12 Tcmcb`c#DyRBTb@eBFi-Z8i@oZ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class index 14d8e73302150c23e955d484f6deb0190d3d47bc..8d9ff83624419fe8f5dab77cb27dd57407896d72 100644 GIT binary patch delta 12 Tcmeyu_=S;$BTb@qBFhH=9P0#k delta 12 Tcmeyu_=S;$BTb@uBFhH=9ODFa diff --git a/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class index 06c8df5e6e916ea32167eb3862c4c25a5295e521..4afd54309810a49f5feb06f4304f85bd42e3c226 100644 GIT binary patch delta 13 UcmeBU>SJQzNRz1B$il@402ZPG=>Px# delta 13 UcmeBU>SJQzNRz19$il@402Y`6=Kufz diff --git a/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class index a3becccbecee91d29a8e27068a09018884e6e4ff..a3b0dab18373f1e8efdba640e63bd916b4bc27fe 100644 GIT binary patch delta 13 UcmZ3%w1SC+BTb@yBZ~?n02xaIH~;_u delta 13 UcmZ3%w1SC+BTb@qBZ~?n02x68HUIzs diff --git a/compiler/frontend/builtins/jet/KFunction0.kotlin_class b/compiler/frontend/builtins/jet/KFunction0.kotlin_class index 79267058d4f1a0b838b72fe3d39021f9a7a86c0f..a0a92ba0b87f5bef0c75748521e393098ad804a3 100644 GIT binary patch delta 11 ScmY#UW#vedXkeVkq5uF3F9Hhy delta 10 RcmY#YVc|%VsGG>D000Te0tf&A diff --git a/compiler/frontend/builtins/jet/KFunction1.kotlin_class b/compiler/frontend/builtins/jet/KFunction1.kotlin_class index a84bfaf0c40a34fa93d9f3ce65217eeae2902d21..02913e8653d5e4ddfd8b7b678f61e027383f9ecd 100644 GIT binary patch delta 11 ScmcDsXXQwfXk?toVg&#VZ~|HY delta 10 RcmcDwW8p}XsGrDc1po`x0#^V4 diff --git a/compiler/frontend/builtins/jet/KFunction10.kotlin_class b/compiler/frontend/builtins/jet/KFunction10.kotlin_class index 2cff94e8554d31b97ae7ecdd643bf1c8994642f6..8601e5f1a7704a46fc4e055c03badc74a1d72aa3 100644 GIT binary patch delta 13 UcmZ3(^b delta 13 UcmbQkGKYnQBTb@nBZ~wR02p!uBLDyZ diff --git a/compiler/frontend/builtins/jet/KFunction2.kotlin_class b/compiler/frontend/builtins/jet/KFunction2.kotlin_class index 98373ef7e719b94422103eb1aaab8ae8785f04c9..99acfed0a96359d10759ed14ea9c33a15001691e 100644 GIT binary patch delta 10 Rcma!yWZ_7Y=$Xh83IGln0}6!(NRya2k);y=6Z!*I delta 12 TcmeBW>}6!(NR#NF$kGV_6Y>L8 diff --git a/compiler/frontend/builtins/jet/KFunction5.kotlin_class b/compiler/frontend/builtins/jet/KFunction5.kotlin_class index 39fdb5f9b7505ae77ba4682b961af33f562aadd9..6a360e4136e35e5c52e37c507c074a0814dfa716 100644 GIT binary patch delta 12 TcmZ3^xSWxNBTZt`M3%(>7E}YJ delta 12 TcmZ3^xSWxNBTZt$M3%(>7EA-9 diff --git a/compiler/frontend/builtins/jet/KFunction6.kotlin_class b/compiler/frontend/builtins/jet/KFunction6.kotlin_class index 4195d5906194acf6367d45d44447dda73591cf49..4facd2ae8cdf4433b2073cfe35778de25711e512 100644 GIT binary patch delta 12 TcmX@ec#x5WBTZuRM3%h(7_I~K delta 12 TcmX@ec#x5WBTZuBM3%h(7^VaA diff --git a/compiler/frontend/builtins/jet/KFunction7.kotlin_class b/compiler/frontend/builtins/jet/KFunction7.kotlin_class index 72dc420b3da1bcaa6571e6cf28369e0ed6c5b8e4..14da717ed65d47d8c96aef3c9846dc9c6ee56b1d 100644 GIT binary patch delta 12 Tcmcc3c$<-hBTZt;M3(CS8wdnL delta 12 Tcmcc3c$<-hBTZt`M3(CS8vq1B diff --git a/compiler/frontend/builtins/jet/KFunction8.kotlin_class b/compiler/frontend/builtins/jet/KFunction8.kotlin_class index ecdcf412a6852b16597ce309cf245d060a77cd57..213a8d0bdfd320eb9971f3aa94734f420beb1249 100644 GIT binary patch delta 12 Tcmey$_?3}`BTZuJM3#>L9byEM delta 12 Tcmey$_?3}`BTZuRM3#>L9a;pC diff --git a/compiler/frontend/builtins/jet/KFunction9.kotlin_class b/compiler/frontend/builtins/jet/KFunction9.kotlin_class index 62dfd0f97b074ba560fcb271198de68933fa64b0..67b4ca90819137786dd566aaaca00f872cfee09b 100644 GIT binary patch delta 13 UcmeBY>Sto%NRybhk%gNP02ed^1ONa4 delta 13 UcmeBY>Sto%NRybdk%gNP02e9)0ssI2 diff --git a/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class index 8b87c02265ac38bac2bf205712bea8accb979677..13b209f27a560e3c3bf079d45147fff00d5be24c 100644 GIT binary patch delta 10 RcmcDwXW>Ybm_Cuk8UPGE0&oBT delta 10 RcmcDwXW>Ybm^zWg8UPG60&V~R diff --git a/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class index cd565090bde38850236c6140d11e45e4a25f7274..9c8cab0173a1abe48e9a9ced50adf8706b677da8 100644 GIT binary patch delta 10 Rcma!yWZ_7Ym@$zh6aWrM0>1zN delta 10 Rcma!yWZ_7Ym^P6m6aWrE0=)nL diff --git a/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class index 7f705d2df96bb18998d1725192ee4e47b7a4ccf2..0af8e2906226a195371c7ef9ecf5cd366881b758 100644 GIT binary patch delta 13 UcmX@ibeM^SBTZuFMizTU033@0qW}N^ delta 13 UcmX@ibeM^SBTZuZMizTU033k>p#T5? diff --git a/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class index 8f5027df48c081c5f4b1268f7cb2f854f923fd44..9c7c4e440b16ec92dd6190dd895948098eec1337 100644 GIT binary patch delta 13 Ucmcb|bdQOJBTZt~MwTc>03S{R^#A|> delta 13 Ucmcb|bdQOJBTZt)MwTc>03SpH^8f$< diff --git a/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class index 2627f520cfebead3ff3602e2a16e859ca7e92160..2ad5eee933072ffde5fbe612afc4bc0edae43203 100644 GIT binary patch delta 13 Ucmey#^plB&BTZuVMwU`W03s0tM*si- delta 13 Ucmey#^plB&BTZuFMwU`W03rtjMF0Q* diff --git a/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class index 5fe323f51127d5c2a5ec58bf55cd9c5233d0c90c..00c38115bf2945265748a7469f5a1b617a967b0b 100644 GIT binary patch delta 13 UcmbQjJcXHsBTZt?MwSVT02t~6n*aa+ delta 13 UcmbQjJcXHsBTZt~MwSVT02tr{nE(I) diff --git a/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class index fa14efe1ef2aa170523942c566efdb8a5b89a992..932e03df25584d9591387b47beacee54809ac33e 100644 GIT binary patch delta 13 UcmZ3_yq=kbBTZuNMwZo#02{3X?EnA( delta 13 UcmZ3_yq=kbBTZuVMwZo#02`wN>i_@% diff --git a/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class index 9db3fca9f8694715ad97d69c52feffef536bca18..06f23c6f6f11818c84f7ba6899a25d793a9266d2 100644 GIT binary patch delta 13 UcmX@be2STcBTZu7MwVlY03L7zKL7v# delta 13 UcmX@be2STcBTZt?MwVlY03K!pJpcdz diff --git a/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class index 4a3b25eb008d6ecee789a199a6e7fa84a68adcc3..638c2862c9a9d46fb68dbaed63ed2f733e55128e 100644 GIT binary patch delta 13 UcmaFL{FIr6BTZudMwW++03kC3kpKVy delta 13 UcmaFL{FIr6BTZuNMwW++03j&^j{pDw diff --git a/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class index 97c750ddb524e275711fe9ec557e30e423dc023c..cb98d500f54a84b1f0ec91b6e30d49b10838003b 100644 GIT binary patch delta 13 UcmZo*X<%XDNRwEwk>w8~02mAdw8~02l%T;{X5v diff --git a/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class index 41881dc099f5f087c707759a2b7ab15d9cac3a1c..883672d8ecdc686c74d769ce2b957caad65fa2b8 100644 GIT binary patch delta 13 UcmbQuGMj~kBTZuAMiy}<02t5%H~;_u delta 13 UcmbQuGMj~kBTZudMiy}<02sytHUIzs diff --git a/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class index 5e1751a6dfa1dc7c3476581f212b63eed9062c22..5081d8330f5db62c6be26b6e96e94f2ebb72d870 100644 GIT binary patch delta 13 UcmdnSvWBTZt_MiwI`02`A7iU0rr delta 13 UcmdnSvWBTZt#MiwI`02_$|hyVZp diff --git a/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class index 922c6aad69d38338309fbe4cdf7d82c9e3188429..dfe99dd2fc80f6a1ef408529045e0708ab2f86df 100644 GIT binary patch delta 10 RcmXReX5mPaSUiy>9{>=20~i1R delta 10 RcmXReX5mPaSU8a-9{><_0~P=P diff --git a/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class index 84a54fa063bb8d3e5d526f3f0187666a23832ceb..667764955ffe792dcf7b7c7a0519b6480d881a87 100644 GIT binary patch delta 13 Ucmcb}a*>6FBTZt-MiyTt03KTd-2eap delta 13 Ucmcb}a*>6FBTZt_MiyTt03J~T+W-In diff --git a/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class index 5e120c07df2fc406f399d6ba3755fef0b4c36b65..662ca437c60d415f59450cab5cebd498d83a6278 100644 GIT binary patch delta 13 UcmaFE@`ik delta 13 UcmZo?ZD(cSNRwEyk)@dl02l28fdBvi diff --git a/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class index f9bd283167f525137d21f9569dbf34c300648a45..574a6c44055ff016746108fad5eb2cf32635bad7 100644 GIT binary patch delta 12 TcmeBW>}6!(NRwDTk);y=6jB3h delta 12 TcmeBW>}6!(NRwDPk);y=6iNeX diff --git a/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class index c37fc81fa644b7fcd1d0e6f7e0f3338492c62531..dc38d4b0b4bb8c5cbd8bfb80793381e3f98b0570 100644 GIT binary patch delta 12 TcmZ3^xSWxNBTZt(M3%(>7OVri delta 12 TcmZ3^xSWxNBTZu2M3%(>7Ni5Y diff --git a/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class index 2654eba314db758b1bc43b6af40d9e813a6f508e..0179ccd3c06f2816902a66e617b3ffef9edb39bc 100644 GIT binary patch delta 12 TcmX@ec#x5WBTZuEM3%h(83qIj delta 12 TcmX@ec#x5WBTZuYM3%h(82$tZ diff --git a/compiler/frontend/builtins/jet/KMemberFunction6.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction6.kotlin_class index 09ab72852112eb98fb2e2a3e0ba5c925cc70d14a..d1dbed3f8b0016c11a5d8e94787dfe1e3f481c82 100644 GIT binary patch delta 12 Tcmcc3c$<-hBTZt}M3(CS8(;)k delta 12 Tcmcc3c$<-hBTZt(M3(CS8(0Ka diff --git a/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class index bd20605e6d62a36c76a53f3074b1350dfc0c8a7a..db34b911d596ab99cf34740b190765ee86a3d012 100644 GIT binary patch delta 12 Tcmey$_?3}`BTZuUM3#>L9l8Xl delta 12 Tcmey$_?3}`BTZuEM3#>L9kK+b diff --git a/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class index d58e11f2efdaad545bc4a6c1939c2d194a4231f0..e01a3c93b1c0660b8bb164cdc91cc73d80441473 100644 GIT binary patch delta 13 UcmeBY>Sto%NRwEzk%gNP02iVI8UO$Q delta 13 UcmeBY>Sto%NRwE#k%gNP02i187ytkO diff --git a/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class index 95e29b58a878a388cd62015905513871d6f397e9..5957bac54c6b594c20eef9c78d91d0db3896fac1 100644 GIT binary patch delta 13 UcmZ37+U&sW}0Ol-$a=^ORA=v-`Y~mE& delta 144 zcmX@hbe4&QBTZt>M3x%HSrZ#=7-vsx6sr{DP&1gr7+pU(u*0Ol-!a=^ORAlU!_Wy}=F diff --git a/compiler/frontend/builtins/jet/ListIterator.kotlin_class b/compiler/frontend/builtins/jet/ListIterator.kotlin_class index 8b9fa64f29d8998298d525b3ec68e353df30e619..479ac8ae48e993980243d0cdc709d703e6e89924 100644 GIT binary patch delta 70 zcmXRbW8p}XSU-_PP5LUM6AKrU0B008hnm4+CMbso$dQ?tC@K@h3uG;2a$@6R;b0VC L0IOOCQN;oP-@6OH literal 118 zcmd-`lUU2B#mB)Qz^cHg#m2=Xz$C$F#0R9=g*b%RxL7zC1sI~ZIn)d;Gdi&Vg*m~T eg-lQm4^T$N30d7Dh!jf{FHmYR6N=mts2l+J*$rg? diff --git a/compiler/frontend/builtins/jet/Long.kotlin_class b/compiler/frontend/builtins/jet/Long.kotlin_class index 9aac6a73712e091b45bb3882ad1d3d475c7af9a3..68a24b9c81b35d0e6d744da8c4833b124db1e687 100644 GIT binary patch delta 77 zcmeC->EYRMn33`H<|B-Em^9BYT5)qQ2%KeEYRMn33`1<|B-Em^4o@T5)qQ2%Kh=V&P&EU~vMGLQxVNYzAjgWhOsl5uf~k O|$i$V3XJ|kwsZlz<|ezg^NjmEsC3i&4AB|m5W(m<3t-xMuCZGN=zFV0k5G5 A3jhEB delta 45 zcmeBT>|$i$V3SxkkwsZl!GOn!g^NjmEsC3i&4AB|m5W(m{X`p0MumxKN=)k*0kNwH AB>(^b diff --git a/compiler/frontend/builtins/jet/LongIterator.kotlin_class b/compiler/frontend/builtins/jet/LongIterator.kotlin_class index 6661b7970fe..400da673b30 100644 --- a/compiler/frontend/builtins/jet/LongIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/LongIterator.kotlin_class @@ -1,8 +1,8 @@ -&¯2 +&±2  Z 0B -Z &0§B +Z &0©B j Æ0B -¯ \ No newline at end of file +± \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/LongProgression.kotlin_class b/compiler/frontend/builtins/jet/LongProgression.kotlin_class index 49ab66d78d20f4cb701a037a36f61a683e5d88d2..2372981deefd1d0bb3210c1576ae9605dbb7759e 100644 GIT binary patch delta 72 zcmb=fw&!4z*u-eW!^I>ZE5s(m0;GkaxH+x~7&tp2aa`aWF#|p)RxW0Njf`Mr6YZ^- HHZcMKp(zYN delta 72 zcmb=fw&!4z*uZGS!^I>ZE5s(m0;GkaxH+yV7&tp2aa`aWF#|p)RxW0N^^9O;6YZ^- HHZTGJrRNN4 diff --git a/compiler/frontend/builtins/jet/LongRange.kotlin_class b/compiler/frontend/builtins/jet/LongRange.kotlin_class index 948879b48cf8e4d275a4cceec666bf7af088d8fe..c42bc326afa57026f11fd34f0d78b521a83ac235 100644 GIT binary patch delta 50 vcmbQrIF)gNorZvcvl9y!lYmeZH^(&r0~a_)%z)2{m5W(mBO_R5Vwyex^U4XO delta 50 vcmbQrIF)gNorZ#evl9y!lYmeZH^(&v0~a_)%z)2{m5W(mJtJ6VVwyex_=XA7 diff --git a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class index b7e8f8ade6a1fb457cb61c58107f7eeca9023afa..f56d78527643267b6f6a5cb70896071354abd09f 100644 GIT binary patch literal 27 gcmd;RW0u&=XvD(BB)}BK&2db?z|#rDk;q~I06;(lQUCw| literal 27 gcmd;RW0u&+XvD(BB)}BK&2db@z|#rDk;q~I06@Y7U;qFB diff --git a/compiler/frontend/builtins/jet/Map.Entry.kotlin_class b/compiler/frontend/builtins/jet/Map.Entry.kotlin_class index 8c8435caa99776973662d85768fbf04ad31a1b18..3ba5303352dd630f03d7449baecdc03ed82ed88f 100644 GIT binary patch literal 75 zcmd-`li0?n#m~VYu$D=IQHza>Nq|WLB)}-J4oSd>1t_5r#mk{)u#L%yjf({+&j99b HhjAGJS>6bw literal 75 zcmd-`li0$j#m~VYu$oDMQHza>Nq|WLB)}-J21&q(1t_5r#mk{)u!YHqjf({+&j99b Hg>e}HSSARX diff --git a/compiler/frontend/builtins/jet/Map.kotlin_class b/compiler/frontend/builtins/jet/Map.kotlin_class index 5c1d06fb61e990e17f0377f92c3622b25687608e..f25b08f12c0723e4cd9bc973c6726d87d5ce801e 100644 GIT binary patch delta 145 zcmeyy_>D1uBTZrpqZTg*gTPuQEjBJD0VWAXEq)G0fpts@j4%Ns7LbI+7N#gE4mE@I zOjaQE8YYH+oKccMxs4M8qy#rHIVo{53v6W+k`|H#GPX^uR$$yPagGYdRwgHY bkj%srGD4>qo%n$I)Py*M*tl4LHZlSL^X(Y( delta 145 zcmeyy_>D1uBTZrxqZTg*gTQJgEjBJD0VWAXEq)G0fi+ADj4%Ns7LbI+CZ;GU4mE?d zOjaQE>zJgV>YYH+oKccMx%CqRqy#rGIVo{53v6Z-k`|H#GPX>tR$yE=agGYdW+o?o bkj%srGD0U9o%n$I)Py*M*tl4LHZlSL>}wd; diff --git a/compiler/frontend/builtins/jet/MutableCollection.kotlin_class b/compiler/frontend/builtins/jet/MutableCollection.kotlin_class index 7d0becc6e8edb0b2260f569fe6e4a7a625001907..78a81b6605ccbd43e93714482d1b2c80156ac7f5 100644 GIT binary patch delta 102 zcmeyt_=Ay!BTZuaL>3jv9gIR8LTp?t9E<`CQBoXg2D_N7csUpZc29H^Vcat@Oi6Vw slM@RUlK@AQC{UKqiJyyEU?;LBNucoliF2hG4@|r*%NC^w3jvZHz)3LTp?t9E<`CQBoXg20NIncsUpZc20B@Vcaz_Oi6V& slM@RUlK@AQC{UKqiJyyEU^}uVNucoFiF2hG_f5Pl%NC^w+zPFt;>Db#5z`jBoSARl z%zN|@mn0ogj~8jcfJ02SQ#RmN645ANJ|)~UjhoX@f+krBa*S&g2#e)D?hjQ`<`^ zpyXr(qa;!5@5A>t1(yHw4wI6|(yRPO65)0d8Bmsue5 zga%_hDm&7F?a;Uh%zmp4y}E|l$h#j|qY8IVx6}K5k|B5k8R92rutDqMVhdxdbgX{? DxSKMc literal 491 zcmaKoO$x#=5QUqul$iPxib%~)7ZnOZahYY$P!MwfPbKOB+zPFt;?10-5z`jBoSARl z%zN|@mn0ogj~8jcfJ02SQ#RmN645ANJ|)~UjhoX@f+krBa*S&g2#e)D?hjQ`<`^ zpyXr(qa;!5@5A>t1(yHw4wI6|(yRPO65)0d8Bmsue5 zga%_hDm&7F?a;Uh%zmp4y}E|l$h#j|qY8IVx6}K5k|B5k8R92rutDqMVhdxdbgX{? Diit9D diff --git a/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class b/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class index 3c8b7a6af4646c6ecf4b16a53c8e6d57b927fb1d..1952847b159243cdf20ee6d4ea867067eb7f1de7 100644 GIT binary patch literal 148 zcmd-`li1Cu#lyiMz^cW@#U#Ka!Dz(K#VoL%QHVo`jf;hYQGfv~uoFojN{U0xU>B1W uFHqZVCMl>gCl;W7jwo)R+*L*}hck)?$dPe^DgaCEXM(De1WE~DH39&&;t(GI literal 148 zcmd-`li10q#lyiMz^cW@#U#Ka!Dz(K#VoLvQHVo`jf;hYQGfv~upLPtN{U0xUG uFHqY~CMl>gCl;W7jwo)R++{{Ehck)?$dPe^DgaCEWrC`c1WE~DH39&zwh#{h diff --git a/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class index ff663b35e4be2877a322921f3f6c3429c1a3e3c1..faabc3d19101e02e4c9aa41865788648acc01049 100644 GIT binary patch delta 72 zcmYdH)Z|E$*vF{F%fTS9mPw0^i%Eb<0>ot$SO@1CNpdj@Y@4X5AaR<>iU+7tP>PL< L1*nA42}%P1gQ5um delta 72 zcmYdH)Z|E$*u$vB%fTS9nn{a|i%Eb<0>ot$SOe!8Npdj@Y?-L3AaRn(iU+7tP>PL< L1*nA42}%P1f#wMJ diff --git a/compiler/frontend/builtins/jet/MutableMap.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.kotlin_class index dcc8c3e65ae9d41e36947479e50b9cad61c0ec03..314da1438616a88c21e275fb63f074b0b18f9f2f 100644 GIT binary patch literal 296 zcmd-`li0(k#mm7Uu$D=Sjf+WuNdm-W6j%r68cA|73v6K&;t*ovVgbr9z*&qI$C;wI zIn)gHGC8pT^>RdM0y&$QoRok%_A&}d3xTxm!>Tn(45)M~lM_EgDctZV9iaFLCM%GW zHZVy+t+e6+as{D0MkfxiLl`9(qx6BQPcm640i{ndNl8Oo%EiHm=~k!<<$xOYBN-3& SF_M8GXPsgMJ8L__;fw&5H6We< literal 296 zcmd-`li0RdM0y!I)oRok%b~6e|3xTxm!KyV%45)N7lM_EgDctZV9iaFzCM%GW z)-g#zt+e6+as{D0MkfxiLl`9(qx6BQk26^*0i{ncNl8Oo%EiHm=~k!<<$xOYA{h_% SF_M8GXPsaKJ8LV#;fw%%Eg*IP diff --git a/compiler/frontend/builtins/jet/MutableSet.kotlin_class b/compiler/frontend/builtins/jet/MutableSet.kotlin_class index e5f805ae8b4fcaecc1697db9cd96b356ad9fa132..a47c5080887e3612d0dd2cc0c9cc2d474b434eb6 100644 GIT binary patch literal 249 zcmd-`li16s#lyiM5TeD##U#Ka!Dz(K#VoLuQHVo`jf;hYQGfv~upLPtN{U0xU>B1W zFHqZVCMl>gCl;W7&L~Bo+#V(?5ujY86dzDX4Pg>g2{%y5UM4VyBT5v=;d27nxf9t6 dNucn4CM%H3!htq`U4~@C0Zbdvl^n#Y1ORAF8jJt{ literal 249 zcmd-`li1Cu#lyiM5TeD##U#Ka!Dz(K#VoLyQHVo`jf;hYQGfv~uoX!lN{U0xUG zFHqY~CMl>gCl;W7&L~Bo+%6_75ujY86dzDX4Pg>g2{%y5ZYD5?BT5v=;d27nxgFUG dNucmvCM%H3!htq`U4~@CK1>_XmF&l>1OQum8g>8x diff --git a/compiler/frontend/builtins/jet/Nothing.kotlin_class b/compiler/frontend/builtins/jet/Nothing.kotlin_class index 3ed54d4b45b..f1b32545956 100644 --- a/compiler/frontend/builtins/jet/Nothing.kotlin_class +++ b/compiler/frontend/builtins/jet/Nothing.kotlin_class @@ -1,3 +1,3 @@ -½j +¿j Â0B -½ \ No newline at end of file +¿ \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Progression.kotlin_class b/compiler/frontend/builtins/jet/Progression.kotlin_class index 005102c826bdee22da5361989626fb43c4c5aae2..104e516effeb72ef2233f12b666494040d4ac418 100644 GIT binary patch delta 56 zcmebA;o?Y>kk#VmU=TPvkxN=#z`)swjf;hYQGg+eo8y^)fr}Fh7n1;Q6fcP51d{^* D3#SOX delta 56 zcmebA;o?Y>kk#VmU=TPxkxN=#!NA#xjf;hYQGg+eo8y^+fr}Fh7n1;Q6fcP51d{^* D5AO)+ diff --git a/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class b/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class index aca683c31fb..47f8ad06d0c 100644 --- a/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class +++ b/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class @@ -1,3 +1,3 @@ -f¾2 -Z æ 0aB +fÀ2 +Z æ0aB % \ 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 8b91c4ef941c91eb6ebc657219e3ebaa94f634b0..3d6330a69ef9c43a11da13464bcc4b6adce25e92 100644 GIT binary patch delta 26 hcmXpt735%(ILK(k%Ec^jfH8`jjyK+HD8LZK%kfOWzzN0$0A64O*8l(j delta 31 gcma!wn&2R%VBqY;#>K+HD8LZK%kfOXzzN0$0AR2L_W%F@ diff --git a/compiler/frontend/builtins/jet/Set.kotlin_class b/compiler/frontend/builtins/jet/Set.kotlin_class index 39c7cdd8274abd20479a28f676d7a4b00540a49c..5a7277d1eafca42d78203bd349cc1d729132fa68 100644 GIT binary patch delta 12 TcmeBY>}O=*NR!w)k);~|6u1L` delta 12 TcmeBY>}O=*NR!w+k);~|6tDw+ diff --git a/compiler/frontend/builtins/jet/ShortArray.kotlin_class b/compiler/frontend/builtins/jet/ShortArray.kotlin_class index c4b137477faab3b5c83326b401f53483ae4335db..8c7f477ef0490a305c26990f219c848de25696d6 100644 GIT binary patch delta 45 zcmeBT>|$i$V3RmBkwsZlz<|ezg^NjmEsC3i&4AB|m5W*6@I)I;MuCZGN=%0s0kby< AK>z>% delta 45 zcmeBT>|$i$V3Rm7kwsZl!GOn!g^NjmEsC3i&4AB|m5W*6;6xiuMumxKN=yeB0kuI0 ATL1t6 diff --git a/compiler/frontend/builtins/jet/ShortIterator.kotlin_class b/compiler/frontend/builtins/jet/ShortIterator.kotlin_class index 69bd992b2b2..1be3be3c473 100644 --- a/compiler/frontend/builtins/jet/ShortIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/ShortIterator.kotlin_class @@ -1,8 +1,8 @@ -&Á2 +&Ã2  Z 0B -Z &0ÐB +Z &0ÒB j Æ0B -Á \ No newline at end of file +à \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/ShortProgression.kotlin_class b/compiler/frontend/builtins/jet/ShortProgression.kotlin_class index 7edc1ec7c8a1378e01fc945f2bc21b475dc0ad89..a2cbac9e52e2584461dc083b0b783bbe4e333526 100644 GIT binary patch delta 72 zcmb=fw&!4zIKpVe!^I>ZE5s(m0;GkbxH+x~7&tp2aa_P07NCrn0iP2q7qh@&MzFGp J_EtZE5s(m0;GkbxH+yV7&tp2aa_P07NCrn0iP2q7qh@YMzFGp J_Et=X7y+u343q!> diff --git a/compiler/frontend/builtins/jet/ShortRange.kotlin_class b/compiler/frontend/builtins/jet/ShortRange.kotlin_class index f5c42bc390a0ffd044e77c59e0c56044254c2c71..c19eb5f95758f43c482783e90e3f6e6191f952d7 100644 GIT binary patch delta 50 ycmbQrIF)gNorZvcvl9y!lYnp(H^(&r0~aud1;`OI;B#W-Viq{e2$q?crVjw~Z3(IX delta 50 ycmbQrIF)gNorZ#evl9y!lYnp(H^(&v0~aud1;`OI;B#W-Viq{a2$q?crVjx4DGAsB diff --git a/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class b/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class index 5bdd1fb8165f13e8667d33d7aa8436cfebe1f1a3..5f9f82e5a846e782899cf94b8eed31c35e31ed99 100644 GIT binary patch literal 27 gcmd;RW0p9|XvD(BB)}BK&2db?z|#rDk<4NM072mdWdHyG literal 27 gcmd;RW0p9~XvD(BB)}BK&2db@z|#rDk<4NM077E~a{vGU diff --git a/compiler/frontend/builtins/jet/String.kotlin_class b/compiler/frontend/builtins/jet/String.kotlin_class index 7550b68b0cbd6e162207c2cb9b217f3bb53da472..ccd975bc5feeb10f494a7d1a9c5e8f0b5f4375a7 100644 GIT binary patch delta 16 XcmZ3=xRh~%GUL^WD$a}o6Ekc9EoB82 delta 16 XcmZ3=xRh~%GUMfmD$a}w6Ekc9Et3T! diff --git a/compiler/frontend/builtins/jet/Throwable.kotlin_class b/compiler/frontend/builtins/jet/Throwable.kotlin_class index 2714bdeec05..83a4eee37f5 100644 --- a/compiler/frontend/builtins/jet/Throwable.kotlin_class +++ b/compiler/frontend/builtins/jet/Throwable.kotlin_class @@ -1,9 +1,9 @@ -Ä2 -Z0×B -ÄZ 0ØB -%Z 0ÙB +Æ2 +Z0ÙB +ÆZ 0ÚB +%Z 0ÛB j- -+Æ0: Õ -%:Ö -ÄB -Ä \ No newline at end of file ++Æ0: × +%:Ø +ÆB +Æ \ 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 fe633c1791ecaaff9fb9aae43b3bb509220cb46b..f789d5a79aa9b866bd6d71a486c39d302a511027 100644 GIT binary patch literal 28 hcmd;RW0pA1XvD(BB)}BK!*NW&;4YIBh{ut|002uz1nmF- literal 28 hcmd;RW0p9|XvD(BB)}BK!*NW(;5L&Jh{ut|002wF1o;2} diff --git a/compiler/frontend/builtins/jet/atomic.kotlin_class b/compiler/frontend/builtins/jet/atomic.kotlin_class index 65f909d7c2f..a01ba01df84 100644 --- a/compiler/frontend/builtins/jet/atomic.kotlin_class +++ b/compiler/frontend/builtins/jet/atomic.kotlin_class @@ -1,4 +1,4 @@ -†Æ2 +†È2 j Æ0B -Æ \ No newline at end of file +È \ 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 95c5e2f4fd2..e746b07d667 100644 --- a/compiler/frontend/builtins/jet/data.kotlin_class +++ b/compiler/frontend/builtins/jet/data.kotlin_class @@ -1,4 +1,4 @@ -†Ç2 +†É2 j Æ0B -Ç \ No newline at end of file +É \ 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 1fe9082bd8e230230d71cc15f69eae7562b2e9ee..9f2bf073833013a425b81f6aecd25c1babefdddb 100644 GIT binary patch delta 14 VcmdPUVC86Ik~lSyRgviwBLEf*155w_ delta 14 VcmdPUVC86Ik~lGuRgvigBLEfp14sY> diff --git a/compiler/frontend/builtins/jet/inline.kotlin_class b/compiler/frontend/builtins/jet/inline.kotlin_class index bbd2232f057..ef684877f69 100644 --- a/compiler/frontend/builtins/jet/inline.kotlin_class +++ b/compiler/frontend/builtins/jet/inline.kotlin_class @@ -1,6 +1,6 @@ -†É2 -Z Æ 0àB +†Ë2 +Z Æ0âB _j -Æ0: à +Æ0: â _B -É \ No newline at end of file +Ë \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/noinline.kotlin_class b/compiler/frontend/builtins/jet/noinline.kotlin_class index 880c8c1658a..3fc85f50a19 100644 --- a/compiler/frontend/builtins/jet/noinline.kotlin_class +++ b/compiler/frontend/builtins/jet/noinline.kotlin_class @@ -1,4 +1,4 @@ -†Ê2 +†Ì2 j Æ0B -Ê \ No newline at end of file +Ì \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/suppress.kotlin_class b/compiler/frontend/builtins/jet/suppress.kotlin_class index cd9202692744a376cc12c6989fb3bc5e080a31cb..884452e88f52b3e2f84d7474383a4c030d689aa4 100644 GIT binary patch delta 36 rcmXpvm*!|=k~qs~#KOfSz?h}UrOt7T(SX@Xl7m6u=|pKMrn8IycX$T> delta 36 rcmXpvm*!|=k~qz1#KOfSz?h}UrOt7T(SX@Xl7m6u@kD7Urqhf7cPs|^ diff --git a/compiler/frontend/builtins/jet/volatile.kotlin_class b/compiler/frontend/builtins/jet/volatile.kotlin_class index 3fc85f50a19..0610f78b6b1 100644 --- a/compiler/frontend/builtins/jet/volatile.kotlin_class +++ b/compiler/frontend/builtins/jet/volatile.kotlin_class @@ -1,4 +1,4 @@ -†Ì2 +†Î2 j Æ0B -Ì \ No newline at end of file +Î \ No newline at end of file diff --git a/compiler/frontend/serialization/src/descriptors.proto b/compiler/frontend/serialization/src/descriptors.proto index ec25a73cfbb..cc994c93291 100644 --- a/compiler/frontend/serialization/src/descriptors.proto +++ b/compiler/frontend/serialization/src/descriptors.proto @@ -156,12 +156,11 @@ message Callable { } enum CallableKind { - // 3 bits + // 2 bits FUN = 0; VAL = 1; VAR = 2; CONSTRUCTOR = 3; - OBJECT_PROPERTY = 4; } /* diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java index bbf3e442f8d..88eac1346c0 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java @@ -1,34 +1,30 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.jetbrains.jet.descriptors.serialization; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; -import java.util.List; - public final class ClassId { private final FqName packageFqName; private final FqNameUnsafe relativeClassName; - @NotNull - public static ClassId fromFqNameAndContainingDeclaration( - @NotNull FqNameUnsafe fqName, - @NotNull ClassOrNamespaceDescriptor containingDeclaration - ) { - NamespaceDescriptor containingNamespace = DescriptorUtils.getParentOfType(containingDeclaration, NamespaceDescriptor.class, false); - assert containingNamespace != null; - List fullNameSegments = fqName.pathSegments(); - FqName namespaceFqName = DescriptorUtils.getFQName(containingNamespace).toSafe(); - List namespaceNameSegments = namespaceFqName.pathSegments(); - assert fullNameSegments.subList(0, namespaceNameSegments.size()).equals(namespaceNameSegments); - List relativeNameSegments = fullNameSegments.subList(namespaceNameSegments.size(), fullNameSegments.size()); - return new ClassId(namespaceFqName, FqNameUnsafe.fromSegments(relativeNameSegments)); - } - public ClassId(@NotNull FqName packageFqName, @NotNull FqNameUnsafe relativeClassName) { this.packageFqName = packageFqName; assert !relativeClassName.isRoot() : "Class name must not be root. " + packageFqName; diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java index e77a220a01a..12f5d72eee6 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java @@ -26,10 +26,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.*; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.lang.types.error.ErrorClassDescriptor; import org.jetbrains.jet.storage.StorageManager; import java.util.ArrayList; @@ -128,7 +125,6 @@ public class DescriptorDeserializer { return loadFunction(proto); case VAL: case VAR: - case OBJECT_PROPERTY: return loadProperty(proto); case CONSTRUCTOR: return loadConstructor(proto); @@ -138,7 +134,17 @@ public class DescriptorDeserializer { @NotNull private PropertyDescriptor loadProperty(@NotNull Callable proto) { - PropertyDescriptorImpl property = createPropertyDescriptor(proto); + int flags = proto.getFlags(); + + PropertyDescriptorImpl property = new PropertyDescriptorImpl( + containingDeclaration, + getAnnotations(proto, flags, AnnotatedCallableKind.PROPERTY), + modality(Flags.MODALITY.get(flags)), + visibility(Flags.VISIBILITY.get(flags)), + Flags.CALLABLE_KIND.get(flags) == Callable.CallableKind.VAR, + nameResolver.getName(proto.getName()), + memberKind(Flags.MEMBER_KIND.get(flags)) + ); List typeParameters = new ArrayList(proto.getTypeParameterCount()); DescriptorDeserializer local = createChildDeserializer(property, proto.getTypeParameterList(), typeParameters); @@ -152,7 +158,7 @@ public class DescriptorDeserializer { PropertyGetterDescriptorImpl getter = null; PropertySetterDescriptorImpl setter = null; - if (Flags.HAS_GETTER.get(proto.getFlags())) { + if (Flags.HAS_GETTER.get(flags)) { int getterFlags = proto.getGetterFlags(); boolean isNotDefault = proto.hasGetterFlags() && Flags.IS_NOT_DEFAULT.get(getterFlags); if (isNotDefault) { @@ -168,7 +174,7 @@ public class DescriptorDeserializer { getter.initialize(property.getReturnType()); } - if (Flags.HAS_SETTER.get(proto.getFlags())) { + if (Flags.HAS_SETTER.get(flags)) { int setterFlags = proto.getSetterFlags(); boolean isNotDefault = proto.hasSetterFlags() && Flags.IS_NOT_DEFAULT.get(setterFlags); if (isNotDefault) { @@ -193,37 +199,6 @@ public class DescriptorDeserializer { return property; } - @NotNull - private PropertyDescriptorImpl createPropertyDescriptor(@NotNull Callable proto) { - int flags = proto.getFlags(); - Name name = nameResolver.getName(proto.getName()); - List annotations = getAnnotations(proto, flags, AnnotatedCallableKind.PROPERTY); - Visibility visibility = visibility(Flags.VISIBILITY.get(flags)); - Callable.CallableKind callableKind = Flags.CALLABLE_KIND.get(flags); - - if (callableKind == Callable.CallableKind.OBJECT_PROPERTY) { - FqNameUnsafe fqName = DescriptorUtils.getFQName(containingDeclaration).child(name); - ClassId objectId = ClassId.fromFqNameAndContainingDeclaration(fqName, (ClassOrNamespaceDescriptor) containingDeclaration); - ClassDescriptor objectClass = typeDeserializer.getDescriptorFinder().findClass(objectId); - if (objectClass == null) { - // if we are not able to find the class for object property - // then something bad has happened since they should be in the same jar - objectClass = new ErrorClassDescriptor(objectId.asSingleFqName().asString()); - } - return new PropertyDescriptorForObjectImpl(containingDeclaration, annotations, visibility, name, objectClass); - } - - return new PropertyDescriptorImpl( - containingDeclaration, - annotations, - modality(Flags.MODALITY.get(flags)), - visibility, - callableKind == Callable.CallableKind.VAR, - name, - memberKind(Flags.MEMBER_KIND.get(flags)) - ); - } - @NotNull private CallableMemberDescriptor loadFunction(@NotNull Callable proto) { int flags = proto.getFlags(); diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java index a90d9f05481..fe4397b0527 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java @@ -272,13 +272,10 @@ public class DescriptorSerializer { ); } - private static ProtoBuf.Callable.CallableKind callableKind(CallableMemberDescriptor descriptor) { - if (descriptor instanceof VariableDescriptorForObject) { - return ProtoBuf.Callable.CallableKind.OBJECT_PROPERTY; - } - else if (descriptor instanceof PropertyDescriptor) { - PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor; - return propertyDescriptor.isVar() ? ProtoBuf.Callable.CallableKind.VAR : ProtoBuf.Callable.CallableKind.VAL; + @NotNull + private static ProtoBuf.Callable.CallableKind callableKind(@NotNull CallableMemberDescriptor descriptor) { + if (descriptor instanceof PropertyDescriptor) { + return ((PropertyDescriptor) descriptor).isVar() ? ProtoBuf.Callable.CallableKind.VAR : ProtoBuf.Callable.CallableKind.VAL; } if (descriptor instanceof ConstructorDescriptor) { return ProtoBuf.Callable.CallableKind.CONSTRUCTOR; diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java index 1eb76baa0c4..95873561694 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java @@ -8380,7 +8380,7 @@ public final class ProtoBuf { * FUN = 0; * * 
-       * 3 bits
+       * 2 bits
        *
*/ FUN(0, 0), @@ -8396,17 +8396,13 @@ public final class ProtoBuf { * CONSTRUCTOR = 3; */ CONSTRUCTOR(3, 3), - /** - * OBJECT_PROPERTY = 4; - */ - OBJECT_PROPERTY(4, 4), ; /** * FUN = 0; * * 
-       * 3 bits
+       * 2 bits
        *
*/ public static final int FUN_VALUE = 0; @@ -8422,10 +8418,6 @@ public final class ProtoBuf { * CONSTRUCTOR = 3; */ public static final int CONSTRUCTOR_VALUE = 3; - /** - * OBJECT_PROPERTY = 4; - */ - public static final int OBJECT_PROPERTY_VALUE = 4; public final int getNumber() { return value; } @@ -8436,7 +8428,6 @@ public final class ProtoBuf { case 1: return VAL; case 2: return VAR; case 3: return CONSTRUCTOR; - case 4: return OBJECT_PROPERTY; default: return null; } } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java index 87614c65bc9..252b2decc5e 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java @@ -46,8 +46,7 @@ public abstract class DeserializedMemberScope implements JetScope { @Override public boolean accept(ProtoBuf.Callable.CallableKind value) { return value == ProtoBuf.Callable.CallableKind.VAL || - value == ProtoBuf.Callable.CallableKind.VAR || - value == ProtoBuf.Callable.CallableKind.OBJECT_PROPERTY; + value == ProtoBuf.Callable.CallableKind.VAR; } }; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java deleted file mode 100644 index 95e468ae3f0..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.descriptors.impl; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.resolve.name.Name; - -import java.util.List; - -public class PropertyDescriptorForObjectImpl extends PropertyDescriptorImpl implements VariableDescriptorForObject { - - private final ClassDescriptor objectClass; - - public PropertyDescriptorForObjectImpl( - @NotNull DeclarationDescriptor containingDeclaration, - @NotNull List annotations, - @NotNull Visibility visibility, - @NotNull Name name, - @NotNull ClassDescriptor objectClass - ) { - super(containingDeclaration, annotations, Modality.FINAL, visibility, false, name, Kind.DECLARATION); - this.objectClass = objectClass; - } - - @NotNull - @Override - public ClassDescriptor getObjectClass() { - return objectClass; - } -} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java index b705cc6f8ae..66fc045267a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java @@ -257,8 +257,4 @@ public final class BindingUtils { @NotNull JetNamedFunction function) { return bindingContext.get(BindingContext.FUNCTION, function); } - - public static boolean isObjectDeclaration(@NotNull PropertyDescriptor propertyDescriptor) { - return propertyDescriptor instanceof VariableDescriptorForObject; - } }