From f9ad6827d4f562854a050e41eda6b12eb00c59a1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 1 Jul 2013 19:26:38 +0400 Subject: [PATCH] Simplify class object naming madness - get rid of DescriptorNamer, always use descriptor.getName() instead - delete AbstractClassResolver.getClassObjectName(), always use "", except for the case of built-ins serialization (class object names should be replaced by "object" when writing files with serialized data for built-ins) - delete NestedClassResolver.resolveClassObject(), always use the other method of this class instead --- .../codegen/ImplementationBodyCodegen.java | 7 ++- .../DeserializedDescriptorResolver.java | 9 +--- .../frontend/builtins/jet/.kotlin_class_names | Bin 748 -> 748 bytes .../frontend/builtins/jet/.kotlin_name_table | Bin 5279 -> 5276 bytes .../frontend/builtins/jet/.kotlin_package | Bin 284 -> 284 bytes .../jet/ByteRange.object.kotlin_class | 2 +- .../builtins/jet/CharArray.kotlin_class | Bin 133 -> 133 bytes .../builtins/jet/CharIterator.kotlin_class | 4 +- .../builtins/jet/CharProgression.kotlin_class | Bin 118 -> 118 bytes .../jet/CharRange.object.kotlin_class | 4 +- .../builtins/jet/CharSequence.kotlin_class | Bin 59 -> 59 bytes .../builtins/jet/Collection.kotlin_class | Bin 230 -> 230 bytes .../builtins/jet/DoubleArray.kotlin_class | Bin 133 -> 133 bytes .../builtins/jet/DoubleIterator.kotlin_class | 4 +- .../jet/DoubleProgression.kotlin_class | Bin 118 -> 118 bytes .../jet/DoubleRange.object.kotlin_class | 4 +- .../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 397 -> 396 bytes .../jet/ExtensionFunction12.kotlin_class | Bin 430 -> 429 bytes .../jet/ExtensionFunction13.kotlin_class | Bin 462 -> 461 bytes .../jet/ExtensionFunction14.kotlin_class | Bin 494 -> 493 bytes .../jet/ExtensionFunction15.kotlin_class | Bin 526 -> 525 bytes .../jet/ExtensionFunction16.kotlin_class | Bin 558 -> 557 bytes .../jet/ExtensionFunction17.kotlin_class | Bin 590 -> 589 bytes .../jet/ExtensionFunction18.kotlin_class | Bin 622 -> 621 bytes .../jet/ExtensionFunction19.kotlin_class | Bin 654 -> 653 bytes .../jet/ExtensionFunction2.kotlin_class | Bin 125 -> 125 bytes .../jet/ExtensionFunction20.kotlin_class | Bin 686 -> 685 bytes .../jet/ExtensionFunction21.kotlin_class | Bin 718 -> 717 bytes .../jet/ExtensionFunction22.kotlin_class | Bin 750 -> 749 bytes .../jet/ExtensionFunction3.kotlin_class | Bin 155 -> 155 bytes .../jet/ExtensionFunction4.kotlin_class | Bin 185 -> 185 bytes .../jet/ExtensionFunction5.kotlin_class | Bin 215 -> 215 bytes .../jet/ExtensionFunction6.kotlin_class | Bin 245 -> 245 bytes .../jet/ExtensionFunction7.kotlin_class | Bin 275 -> 275 bytes .../jet/ExtensionFunction8.kotlin_class | Bin 306 -> 306 bytes .../jet/ExtensionFunction9.kotlin_class | Bin 336 -> 336 bytes .../builtins/jet/FloatArray.kotlin_class | Bin 134 -> 134 bytes .../builtins/jet/FloatIterator.kotlin_class | 4 +- .../jet/FloatProgression.kotlin_class | Bin 119 -> 119 bytes .../jet/FloatRange.object.kotlin_class | 4 +- .../builtins/jet/Function0.kotlin_class | Bin 41 -> 41 bytes .../builtins/jet/Function1.kotlin_class | Bin 70 -> 70 bytes .../builtins/jet/Function10.kotlin_class | Bin 342 -> 342 bytes .../builtins/jet/Function11.kotlin_class | Bin 374 -> 373 bytes .../builtins/jet/Function12.kotlin_class | Bin 406 -> 405 bytes .../builtins/jet/Function13.kotlin_class | Bin 438 -> 437 bytes .../builtins/jet/Function14.kotlin_class | Bin 470 -> 469 bytes .../builtins/jet/Function15.kotlin_class | Bin 502 -> 501 bytes .../builtins/jet/Function16.kotlin_class | Bin 534 -> 533 bytes .../builtins/jet/Function17.kotlin_class | Bin 566 -> 565 bytes .../builtins/jet/Function18.kotlin_class | Bin 598 -> 597 bytes .../builtins/jet/Function19.kotlin_class | Bin 630 -> 629 bytes .../builtins/jet/Function2.kotlin_class | Bin 101 -> 101 bytes .../builtins/jet/Function20.kotlin_class | Bin 662 -> 661 bytes .../builtins/jet/Function21.kotlin_class | Bin 694 -> 693 bytes .../builtins/jet/Function22.kotlin_class | Bin 726 -> 725 bytes .../builtins/jet/Function3.kotlin_class | Bin 131 -> 131 bytes .../builtins/jet/Function4.kotlin_class | Bin 161 -> 161 bytes .../builtins/jet/Function5.kotlin_class | Bin 191 -> 191 bytes .../builtins/jet/Function6.kotlin_class | Bin 221 -> 221 bytes .../builtins/jet/Function7.kotlin_class | Bin 251 -> 251 bytes .../builtins/jet/Function8.kotlin_class | Bin 281 -> 281 bytes .../builtins/jet/Function9.kotlin_class | Bin 312 -> 312 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 -> 134 bytes .../builtins/jet/IntIterator.kotlin_class | 4 +- .../builtins/jet/IntProgression.kotlin_class | Bin 119 -> 119 bytes .../builtins/jet/IntRange.object.kotlin_class | 4 +- .../builtins/jet/Iterable.kotlin_class | Bin 48 -> 48 bytes .../builtins/jet/Iterator.kotlin_class | Bin 53 -> 53 bytes .../jet/KExtensionFunction0.kotlin_class | Bin 63 -> 63 bytes .../jet/KExtensionFunction1.kotlin_class | Bin 89 -> 89 bytes .../jet/KExtensionFunction10.kotlin_class | Bin 323 -> 323 bytes .../jet/KExtensionFunction11.kotlin_class | Bin 351 -> 350 bytes .../jet/KExtensionFunction12.kotlin_class | Bin 378 -> 377 bytes .../jet/KExtensionFunction13.kotlin_class | Bin 405 -> 404 bytes .../jet/KExtensionFunction14.kotlin_class | Bin 432 -> 431 bytes .../jet/KExtensionFunction15.kotlin_class | Bin 459 -> 458 bytes .../jet/KExtensionFunction16.kotlin_class | Bin 486 -> 485 bytes .../jet/KExtensionFunction17.kotlin_class | Bin 513 -> 512 bytes .../jet/KExtensionFunction18.kotlin_class | Bin 540 -> 539 bytes .../jet/KExtensionFunction19.kotlin_class | Bin 567 -> 566 bytes .../jet/KExtensionFunction2.kotlin_class | Bin 115 -> 115 bytes .../jet/KExtensionFunction20.kotlin_class | Bin 594 -> 593 bytes .../jet/KExtensionFunction21.kotlin_class | Bin 621 -> 620 bytes .../jet/KExtensionFunction22.kotlin_class | Bin 648 -> 647 bytes .../jet/KExtensionFunction3.kotlin_class | Bin 141 -> 141 bytes .../jet/KExtensionFunction4.kotlin_class | Bin 167 -> 167 bytes .../jet/KExtensionFunction5.kotlin_class | Bin 193 -> 193 bytes .../jet/KExtensionFunction6.kotlin_class | Bin 219 -> 219 bytes .../jet/KExtensionFunction7.kotlin_class | Bin 245 -> 245 bytes .../jet/KExtensionFunction8.kotlin_class | Bin 271 -> 271 bytes .../jet/KExtensionFunction9.kotlin_class | Bin 297 -> 297 bytes .../builtins/jet/KFunction0.kotlin_class | Bin 37 -> 37 bytes .../builtins/jet/KFunction1.kotlin_class | Bin 63 -> 63 bytes .../builtins/jet/KFunction10.kotlin_class | Bin 297 -> 297 bytes .../builtins/jet/KFunction11.kotlin_class | Bin 324 -> 323 bytes .../builtins/jet/KFunction12.kotlin_class | Bin 352 -> 351 bytes .../builtins/jet/KFunction13.kotlin_class | Bin 379 -> 378 bytes .../builtins/jet/KFunction14.kotlin_class | Bin 406 -> 405 bytes .../builtins/jet/KFunction15.kotlin_class | Bin 433 -> 432 bytes .../builtins/jet/KFunction16.kotlin_class | Bin 460 -> 459 bytes .../builtins/jet/KFunction17.kotlin_class | Bin 487 -> 486 bytes .../builtins/jet/KFunction18.kotlin_class | Bin 514 -> 513 bytes .../builtins/jet/KFunction19.kotlin_class | Bin 541 -> 540 bytes .../builtins/jet/KFunction2.kotlin_class | Bin 89 -> 89 bytes .../builtins/jet/KFunction20.kotlin_class | Bin 568 -> 567 bytes .../builtins/jet/KFunction21.kotlin_class | Bin 595 -> 594 bytes .../builtins/jet/KFunction22.kotlin_class | Bin 622 -> 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 351 -> 350 bytes .../jet/KMemberFunction12.kotlin_class | Bin 378 -> 377 bytes .../jet/KMemberFunction13.kotlin_class | Bin 405 -> 404 bytes .../jet/KMemberFunction14.kotlin_class | Bin 432 -> 431 bytes .../jet/KMemberFunction15.kotlin_class | Bin 459 -> 458 bytes .../jet/KMemberFunction16.kotlin_class | Bin 486 -> 485 bytes .../jet/KMemberFunction17.kotlin_class | Bin 513 -> 512 bytes .../jet/KMemberFunction18.kotlin_class | Bin 540 -> 539 bytes .../jet/KMemberFunction19.kotlin_class | Bin 567 -> 566 bytes .../jet/KMemberFunction2.kotlin_class | Bin 115 -> 115 bytes .../jet/KMemberFunction20.kotlin_class | Bin 594 -> 593 bytes .../jet/KMemberFunction21.kotlin_class | Bin 621 -> 620 bytes .../jet/KMemberFunction22.kotlin_class | Bin 648 -> 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 -> 412 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 -> 134 bytes .../builtins/jet/LongIterator.kotlin_class | 4 +- .../builtins/jet/LongProgression.kotlin_class | Bin 119 -> 119 bytes .../jet/LongRange.object.kotlin_class | 4 +- .../builtins/jet/Map.Entry.kotlin_class | Bin 75 -> 75 bytes .../frontend/builtins/jet/Map.kotlin_class | Bin 243 -> 243 bytes .../jet/MutableCollection.kotlin_class | Bin 246 -> 246 bytes .../builtins/jet/MutableIterable.kotlin_class | Bin 59 -> 59 bytes .../builtins/jet/MutableIterator.kotlin_class | Bin 50 -> 50 bytes .../builtins/jet/MutableList.kotlin_class | Bin 486 -> 486 bytes .../jet/MutableListIterator.kotlin_class | Bin 146 -> 146 bytes .../jet/MutableMap.MutableEntry.kotlin_class | Bin 96 -> 96 bytes .../builtins/jet/MutableMap.kotlin_class | Bin 290 -> 290 bytes .../builtins/jet/MutableSet.kotlin_class | Bin 246 -> 246 bytes .../builtins/jet/Nothing.kotlin_class | 2 +- .../builtins/jet/Progression.kotlin_class | Bin 76 -> 76 bytes .../jet/PropertyMetadata.kotlin_class | 4 +- .../jet/PropertyMetadataImpl.kotlin_class | Bin 49 -> 49 bytes .../frontend/builtins/jet/Set.kotlin_class | Bin 225 -> 225 bytes .../builtins/jet/ShortArray.kotlin_class | Bin 134 -> 134 bytes .../builtins/jet/ShortIterator.kotlin_class | 4 +- .../jet/ShortProgression.kotlin_class | Bin 119 -> 119 bytes .../jet/ShortRange.object.kotlin_class | 4 +- .../frontend/builtins/jet/String.kotlin_class | Bin 163 -> 163 bytes .../builtins/jet/Throwable.kotlin_class | 12 ++--- .../builtins/jet/Unit.object.kotlin_class | 4 +- .../frontend/builtins/jet/atomic.kotlin_class | 2 +- .../frontend/builtins/jet/data.kotlin_class | 2 +- .../builtins/jet/deprecated.kotlin_class | Bin 37 -> 37 bytes .../builtins/jet/volatile.kotlin_class | 2 +- .../serialization/AbstractClassResolver.java | 9 ---- .../serialization/ClassSerializationUtil.java | 15 +++--- .../serialization/DescriptorNamer.java | 44 --------------- .../serialization/DescriptorSerializer.java | 8 +-- .../descriptors/serialization/NameTable.java | 9 ++-- .../serialization/NestedClassResolver.java | 3 -- .../DeserializedClassDescriptor.java | 2 +- .../types/lang/BuiltInsSerializationUtil.java | 51 +++++++++--------- .../lang/BuiltinsNamespaceDescriptorImpl.java | 6 --- .../AbstractDescriptorSerializationTest.java | 37 ++----------- .../BuiltinsDeserializationTest.java | 12 +---- .../WriteSerializedInfoTest.java | 9 +--- .../builtins/BuiltInsSerializer.java | 19 ++++--- 190 files changed, 103 insertions(+), 215 deletions(-) delete mode 100644 compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorNamer.java diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index d213bea670f..21c70dc97de 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -41,7 +41,10 @@ import org.jetbrains.jet.codegen.signature.kotlin.JetMethodAnnotationWriter; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.JetTypeMapper; import org.jetbrains.jet.codegen.state.JetTypeMapperMode; -import org.jetbrains.jet.descriptors.serialization.*; +import org.jetbrains.jet.descriptors.serialization.ClassSerializationUtil; +import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer; +import org.jetbrains.jet.descriptors.serialization.NameSerializationUtil; +import org.jetbrains.jet.descriptors.serialization.ProtoBuf; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; import org.jetbrains.jet.lang.psi.*; @@ -222,7 +225,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { private void writeKotlinInfo() { AnnotationVisitor av = v.getVisitor().visitAnnotation(JvmStdlibNames.KOTLIN_INFO_CLASS.getDescriptor(), true); - DescriptorSerializer serializer = new DescriptorSerializer(DescriptorNamer.DEFAULT); + DescriptorSerializer serializer = new DescriptorSerializer(); final ByteArrayOutputStream classStream = new ByteArrayOutputStream(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java index 54e60b7e813..47a5d1a8f01 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java @@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager; @@ -268,7 +267,7 @@ public final class DeserializedDescriptorResolver { @NotNull @Override protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) { - return ClassSerializationUtil.getClassId(classDescriptor, DescriptorNamer.DEFAULT); + return ClassSerializationUtil.getClassId(classDescriptor); } @Nullable @@ -277,12 +276,6 @@ public final class DeserializedDescriptorResolver { return javaClassResolver.resolveClass(kotlinFqNameToJavaFqName(classId.asSingleFqName())); } - @NotNull - @Override - protected Name getClassObjectName(@NotNull ClassDescriptor outerClass) { - return DescriptorUtils.getClassObjectName(outerClass.getName()); - } - @Override protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) { //nothing to do here diff --git a/compiler/frontend/builtins/jet/.kotlin_class_names b/compiler/frontend/builtins/jet/.kotlin_class_names index 8176b7eaaaa236854621e354b2dde54144280f1e..403d64543c4c8408d9df1efd8d448795049d011d 100644 GIT binary patch literal 748 zcmW;J*-H>n6bIlLv(0wR2Mes!dXvg}=|R&6i8PCh1eYR$K=6MMf*=TjAP5SApwuj+ zY|~8BtfwL{GfOj5+q7)4)zZpu9Qf|fT_$cGV8#=LR-!1apkpWH66R){sY>9I_~&kRq0` znQbf}n?3AhAGz%3040=ikVBMFP6dZK!cmTKoD-bn6sI}ESZc)u`YPiE)YPrXK>Ucms4K(tQVv=a$5s#V9c4p8_3r~1TD{Zv%jOV>dHmkft5l38S-*^SU`9PqXe~rYOkf>M?i7r18pb#aVXz9E z12I4jPKDALP&yk**8ypeMU616EigtqjL`*S^fJ0bRZoBkO@=Y1!5A}Pj9D_)~4CU&;`q^#8BlFb!N=Xn{=P4*D@RPQOlz{SSFAm9z9eW0`-m=+O$ z$p=Hl!=Q9Hln#N?aZoxQN+*J8QMmqOAfFv*&uT^}V-1*54-{GlVzF_Efz^W4oQA16 z17n3tAdm^AbD(rRkOmpi1k>3HV|2h6-7rQUkYNK>JrO1}1;&^TW6Xjv zX2TfsV2p*6>xJwXS54k0bhQ2`OmG$x)CJREj72cUVi;p7h{47o4)^dnn9OnrBST<4 zOk^vJu?xo70%IJ2G4?SjLoGc76FLZC6bKxKiJX|MCZcR|7REgfVz6;Yz(X_uYQ!ao T1Up=UVRF5QEGIae?gHfi+|Ng! diff --git a/compiler/frontend/builtins/jet/.kotlin_package b/compiler/frontend/builtins/jet/.kotlin_package index 6208de7aa573d8993aa569b601a0fb24751034de..8c736d5d0e428810b02f8de3ab6092759c8d6445 100644 GIT binary patch delta 75 zcmbQkG>1vpkb_N$hl4?YRf~;_Nq|v;(ctbxVIRhO6B7#M)8JzFnXI^hiXJdYv4B)r Si2^wfCw@?64|D1vpkb_N$hl4?YRf~;_Nq|v;(cs=hVIRi(6B7#M)8S$dn5?*giXJjav4B)r Si2^x~CVo(54{`ztC<6fgISs}D diff --git a/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class b/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class index 3ade3eee8b9..01ad0fbf162 100644 --- a/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class @@ -1,4 +1,4 @@ † H2 R Â0B -Z Æ0JB +Z Æ0IB  \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/CharArray.kotlin_class b/compiler/frontend/builtins/jet/CharArray.kotlin_class index 43384cc46b31dcff01b1ea3dcdeb4da9a142c0b1..39b481e385d7fd6ad5e499321ba1af451d98aff0 100644 GIT binary patch delta 12 TcmZo=Y-MEOU{mm#$kGS^5Do&L delta 12 TcmZo=Y-MEOU{mm($kGS^5E25Q diff --git a/compiler/frontend/builtins/jet/CharIterator.kotlin_class b/compiler/frontend/builtins/jet/CharIterator.kotlin_class index b0f323df459..8bc59d0a30b 100644 --- a/compiler/frontend/builtins/jet/CharIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/CharIterator.kotlin_class @@ -1,8 +1,8 @@ -& L2 +& K2  R Æ0B  Z 0B Z -&0MB +&0LB  \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/CharProgression.kotlin_class b/compiler/frontend/builtins/jet/CharProgression.kotlin_class index b7fad7578e0fadc38f15b13ad0d8b05e9b570833..2a8d3e3e5405e3e004dae053ac270898c93d3192 100644 GIT binary patch delta 10 RcmXRbW8q*^@SVs~1ON?50&@TW delta 10 RcmXRbW8q*^@SDg|1ON?90(1ZX diff --git a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class index 1e33a8e8979..44e85b154e7 100644 --- a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class @@ -1,4 +1,4 @@ -† O2 +† N2 R Â0B -"Z Æ0JB +"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 188c35d03e5bf77db88ffc75cfe3eeab5ace0d65..4186c13c87868b753c5b4ee05f9ca3831f5398ad 100644 GIT binary patch delta 30 icmcDvX5mOv@Sn({A{^kv!o?)O6vf4%W)KKwD+2&dRs?VW delta 30 icmcDvX5mOv2$;yCA{^+%!o?)O6vf4%W)K8sD+2&dhy-&0 diff --git a/compiler/frontend/builtins/jet/Collection.kotlin_class b/compiler/frontend/builtins/jet/Collection.kotlin_class index c641eb48a28d3bfb06d649c02ad8c7e96e4ffbcc..6bbb098a3fc210f6888876d10f1496024953720d 100644 GIT binary patch delta 70 zcmaFH_>7T@BTXS#i;sgrAY>w!wsg1@8yAxRqXeT93y|iBQs7WCh_Dg?N=Hr%kY7T@BTXShi;sgrAao*^wseFP8yAxRqXeT93y|iBQs7WCh_n&`N=Ho$kYl$kGS^5LyDV delta 12 TcmZo=Y-MEOU{i>j$kGS^5MBba diff --git a/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class b/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class index 0a3fe685b09..ca4166e7a82 100644 --- a/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class @@ -1,8 +1,8 @@ -& _2 +& ^2  R Æ0B (Z 0B Z -&0`B +&0_B  \ 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 ab17a7197b0707310b974dde1096b45187208365..17b77e93e78ca745c2741cb23cdf1165719c6152 100644 GIT binary patch delta 10 RcmXRbW8q*^NSMe{1ON?{0)_wp delta 10 RcmXRbW8q*^NSw%01ON@00*3$q diff --git a/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class b/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class index b8b0426b9ee..604edababd5 100644 --- a/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class @@ -1,4 +1,4 @@ -† b2 +† a2 R Â0B -*Z Æ0JB +*Z Æ0IB  \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Enum.kotlin_class b/compiler/frontend/builtins/jet/Enum.kotlin_class index 06bd242616a1ea2974462f01d58e1123a957e564..918242a4bcb919c55dd9b2cc55c0041a57dc34d1 100644 GIT binary patch delta 77 zcmb=e<>F9NNYWDFU=RqI$fckfqQ%F>B%m$CA;iYT!oeuOV8Cp}1(ZydVgZUPgV`w) U{iTJIoxlQ7TpVl$DPT4e0GfIU+5i9m delta 77 zcmb=e<>F9NNY)bJU=RqM$fckfs>R2}B%m$CA;iYT!oeuOV8Cp}1(ZyYVgZUPgW0JQ U{iTIdoWKH6TpVl$sbDq}0GpHv;Q#;t diff --git a/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class index 23ed2dabc97f445330e18558b7b3ee8c199c7287..e975eb46a2cfcc6da665cd31234ec946f98d89e4 100644 GIT binary patch delta 42 ucmZ>8km5*FNY&!wU=UzcV9;XYViI7KU8km5*FNYmouU=UzcV9;XYViI7KU0^kS8yH!Doqis}pQ(;h(p literal 365 zcmY++s0;f4ADLgr_vKB(Y}}s8 EzxbCR_W%F@ literal 397 zcmY+DGIYq# zog#=`f(}>%&6Hi5D|@t1HnddsX{8*{S~;YRGSXH#qMdR~`-aba#=@_$2y4&>n!qF7g4~vibB>+gsi(LVm(B0*|J~W KAWVk!sq_mSL?IFY diff --git a/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class index 85fc9a17f64ed44e16634b4fc64f0fae61c3e81e..d2c573b1e182472ef6bd4bda48198a4d1cf1374c 100644 GIT binary patch literal 429 zcmY+E;s zW>)TnHbS>D;8fVgxv+x^VTDU!7gxd_u7!Qv2y5I52e=asaW5RI{aSrem%IN2A;wR0NOgka z4C diff --git a/compiler/frontend/builtins/jet/ExtensionFunction13.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction13.kotlin_class index 2fae354ae797d24d9e2fdc97ff91e3e0a1944f80..3f5dc9d700e055917521a93fa4fcbd6a657a15f0 100644 GIT binary patch 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 literal 462 zcmY+=xekIr5XNy97Fe!zN@GQ3L1io{eGDH!jmG;vqw#t=-^pbd5~lq9tNBI^(znR8 zvcOHP%nNN0&B6l4%r;D!9hfmom@~VuVD@0i?8Ay#!J0XM4RZ+Fnj0#DyI>)PCl3jH z>Om_F!&FogyRw+t{|VJLNt(S@XOze050h4Df!dL5)Sl#^4kU>>l3dh@6ItzKRp;Ge*gdg diff --git a/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class index cfc8afd410b7576fc4c3d900d66c3d3e2be12469..63323c4309926423f4b4b9755c8034dc5561c32a 100644 GIT binary patch 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> literal 494 zcmY+=Hx9y35Jgdc$B%J%C8BagL4_zOSq2LL1S01s5Qwx!7K0g&B~N*7HE(n`d8vA& z4LFHWcYPD8^0&f3*u+TK!dTeGMA*Sp*u_lP!(3QnAzZ>z*vG2iSeJ28A_Ta}5aJ<2 zgm*DSIz}&1`R1nm-`@EuT}zXlKEP=7TS5AmVKuWNtyv~%!?H+QmQC8R9MYcUk`647 jbYyALiB%$VhqDx`URhX)rKQL400=S9V+bLpC-o9qshg^ zj s%Oh=AS<;rJNjp}Kv}gIXFumodn0eyaFd$wHL*m^qBEAgc`tKop0Lou13jhEB diff --git a/compiler/frontend/builtins/jet/ExtensionFunction16.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction16.kotlin_class index a2a63bcf67fca4a701d45864b42f1727e8869431..83edf81f169951221bd898ef50b69983ab3e5222 100644 GIT binary patch literal 557 zcmY+=xo*Nx5QSl1XuK%jELWcF>!C05RZl_@obn8uZHN|{%igN DWuGp% literal 558 zcmY+=xo*Nx5QSl15|9D13*N?8WPqZq99OELh`&+vBz^Iru_bD z=IDNQRqa??a5Jmz1vb<}X@#M%jgfE-V_^pqVHZMsOb774a;W`$=0bcK%=mri- zgb<%HL^#P1<4cAF-!cHd_aW9P2AMLebe(dY$D7ivB00rGR_7@Xi|L-5l@;lYWs{by z8fnFHNNbi$+ORy*mgSRnEKPc6)k%9+kVnNWABx!^9t}g{*)Sqr3}fPtVM6>fM6dcU F{Rf^BF5LhC diff --git a/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class index 2a7d74f1efd0361108bd4cb5c4a298231373d0e3..2bb8425845e36ebfc60ee777c3506d3becdc2f75 100644 GIT binary patch literal 589 zcmY+=xlY4S5QSl1uh;vrD@5gr!WByCGLOLnBnpCreMdx~M6o~wcw+4FT**^@e>HRT 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@&E5|9b0Rl<{**6jpC=tj}A_95gm|?EuDZjs( zIr^g5t1{6R+`=loz=k?ITH#XI##Fe2nXrRvVHY>T9&Uww+zD&k3wQA#9N@9#REJn8 z5h8rZ5Mv`lf?9?Y-!cF@88RH&A<;R;g)%b@oa0=h+Sa`$In8EPe^N!wmRIK|E7B9o zCOxw{q!*S$dS$t!Im;uxv3$}yOOqC?E@{aMs<^pjt(YP4(=Z}#4P)Y$VM6>dOo_jS MApRLmbxk+$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} literal 622 zcmY+=xo*Nx5QSl1W1EZdatsZka+QKAqNL1YFH5q%F9qRr7oss&ckMOV~z7IESvVgPyR9zOaXZa2`WpjgfExV__eYE62Ks zg%TmaN`?@hGDKL*5aU}0U@Jp{Ul~d`T!%=P(M*-ut?r!nyFc0bCQD8>qILV&2(oe8 z)r%GBiDi?ftQ={^a!7NQOL}H`q!(76^vcqtH&%i4&hi^!cFR&Ri^LDZfcRw?5;uks W@y9SG?hHZvGfap_!_wX5`|>~8mNXgw diff --git a/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class index c2285e8e1fb8bc3c261bcc436d185b0c8040fe7b..9b0864a8a2540dd4ce31daf72bffdb077b004441 100644 GIT binary patch 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& e3tx!b;34zugu6t eWllaT3-VQ2lJ828pUMvTt?ZJ&%HHbijQ&5!R5t_w diff --git a/compiler/frontend/builtins/jet/ExtensionFunction2.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction2.kotlin_class index 95a157c5a004da1c6e6d0e306f99f595b9bba923..9038cb491d11ec902be34c66df77fb78a028544a 100644 GIT binary patch literal 125 zcmd-`Q<%x9#mB)Qz^cHY#m2=Xz$gLYGYVv)@Rnb}ehJ|mb{2IVn1K}4AWxQ+^D diff --git a/compiler/frontend/builtins/jet/ExtensionFunction20.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction20.kotlin_class index 3e34cd3cd1f27aa2271de8803b73c3a65d0505d9..158d8a14cfd2460602f437ab98502d070d1732f8 100644 GIT binary patch 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 literal 686 zcmY+=$w~uJ6olcvo$lnO(?ewfan&mqS&7RmeT+PSisC$vD2k#eilQj$YxsP2PR@bU z^7~gs`K9vP4RRkKE`vcm3E^hOc335cSSQ!8L5{FVjJ%km8y{hFcCf?l}~A$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 literal 718 zcmY+>$w~uJ5QX8so$k&}r-zdfan&mqS&7RmeT+On6vcTSQ540XD2k%s^fJDeos(OT zT7LhkIAw>$x9MfpLs)pdDE47y#x__{_OYg1!MbvQ4doD<$`Q7dtJqey*io)wS2@Ps zlyh6hg;62Fl@2LxbjWb0LymhLfJYq~c-EnbR~=e-*P)G19Xj}#4w>y@sW3A2LNK0u z@aNmPG6m)C-u!YuDgUuLJF%hmoqX!RsX`q(1=NvKNF6&x)QMA-I(4$tnNy8AcZ&OI wdCR47tdrNmguE4| diff --git a/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class index 309f2bf02b1c299e4c78d0929ed5cd545db26fc1..3b05f4824ec7c093ee70a6b94bff1fcde74fa18f 100644 GIT binary patch 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 literal 750 zcmY+>%Syvg6ouiOG)Yg>Bwf9Wql_GMBn~_DF?;|O#ryq=q9_$bQ4|Hm+bj7%rn_fD z*YNvCo4xFO{%v}h^$_M>FN%GbiJ=Xa$UaucC9IMItdT>klOt@9%h)7aY>_M2Cdb$r zbIn$9W+)`M;E>{qLxur|8g4lN_Z;eY`2YX_ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class index 338bab207b3b2aa5d2d3aa85226537c87b6f56fb..63d81610d4353cea7d73d2fa19f8e8522dfe08a7 100644 GIT binary patch literal 155 zcmd-`Q&`NX#mB)Qz^cHY#m2=Xz$gLYGYVv)@RNapgd+UuN=x_af0Yz1pw1S4^{vG literal 185 zcmd-`Q&`HV#mB)Qz^cHY#m2=Xz$gLYGYVv(@RNap*&_VuL87=aZ0 literal 245 zcmd-`Q&`TZ#mB)Qz^cHY#m2=Xz$gLYGYVv(@R7x07W3K1Lg8UeN9r=3?4rZK0kMPpk~1i zF}o(sJZL$Za5VNf8&|j(2V9LKZpI0B;~EcRMwjWozX@ZL!**U8Ppio! bdaAsrS5=~yDu~{yDEg?9=&P!C({KI(tU?yq literal 275 zcmY+;yAHxI429u1O;QUXbVkIKiJ?=)$jD>x0DwSThjQr)@tCBp89aU-e16{LFEulE zh}ku1;z9Glgrl*?*|@^RIN)j=aWhW18`pRkGxnMO`>QZ?Y&%|-ODHX_J*=mt@w6CC bqE6*SPgNy)se=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 literal 306 zcmY+;I}XAy5QJf`V>=E)Xi7xoDn%+pNy#xd03Z-=DLhLq!!2<(OR?oQ&HQndzSNAO zflsCh0}C2=CTx{0_R0kg$___mkCSr1S-HeTIpV5ZVV&sTGjmn)0l{;B!_s1g}= diff --git a/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class index 4af760ccc75555bd0822c34f409786ca7ed58503..920fb4a8e1aef629ffe39c33a481090f256bd315 100644 GIT binary patch literal 336 zcmY+Bh38JIj$CEKho}O45rJNN-j(>+Z%M+GHFB diff --git a/compiler/frontend/builtins/jet/FloatArray.kotlin_class b/compiler/frontend/builtins/jet/FloatArray.kotlin_class index 7649b7fbd389a9ae318592d6b75ae194d1417fc4..3a71c7334607294ae86e932c8dd5ea9593a5ae3f 100644 GIT binary patch delta 12 TcmZo;Y-42MU{hE%k);U$5v2nH delta 12 TcmZo;Y-42MU{hE#m2=Xz$n3J!~&wDcsSGy(w*42SU4C37yxUO1Ze;O literal 41 tcmd-`Q`o?$#mB)QkgmX}#m2=Xz$n3J!~&wDcsSGyGMw1BSU4C37yxVH1Z)5R diff --git a/compiler/frontend/builtins/jet/Function1.kotlin_class b/compiler/frontend/builtins/jet/Function1.kotlin_class index fc1c509d7bda9236eb3e36b44a855385fa674bf9..41067912ac246b3a30aec3155a01ff3cd413558f 100644 GIT binary patch literal 70 zcmd-`Q{dF%<6scTRAA6z<6;tElwbt%83oc57-4)P7La(96o;BYx)l#lZI%=p7Yk4g JgA;^i1OVw(1|R?c literal 70 zcmd-`Q{dF%<6scTQeeCco(W p=$f=)okYYsi!AFR%2-#CW8FkK>n`%Fhp1pZMS=Aam6P8hegQyz9X9{~ literal 342 zcmY+;IS#@w5Cu?=<2a6m&@T~{D~eQzl9FR^06-x2eLV-);D#i_P)zx{7bfXLRXZ5W zlc{{PpiX1LQrTjqoMEl(uu;yjRrc5^7uYKY9F$8Ol_RE!{=b21p5r%#UVk=h)%iu& pM^~o}>m(x9S!7ukQO3H89P1{^S$C0VJwyfTDGIEYs2u$k@e5E{9ZmoM diff --git a/compiler/frontend/builtins/jet/Function11.kotlin_class b/compiler/frontend/builtins/jet/Function11.kotlin_class index 6ea0a045fdb62bb26ffca69d96aad913e39fc3ac..145a5cec29a467138f07a694eb0a520a61f7fb2d 100644 GIT binary patch literal 373 zcmY+y4w4?*3=gt>Bvg>r;EZ>klSn ztDc$ltT**Uz&ePCbrglHlPF@HMTT_|#jLByvTmY;br(6-LzI^7y5&VeKl(*wUkJM& A*#H0l literal 374 zcmY+OVNjK9HyA z(KPdN>wJQCWuUpTPYdOMmdb`!$|0?lEp3z|+A1UMlw;c0+(JiBs0}G5G|u23+&5MD z@D14QO^QbOX4bLJlrKEiK?JO$$Y-5I0qZO>tcxgQT}7646Gg1M2w4wNTr|s;7YN

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 literal 406 zcmY+uDP4vOP^0nvenz7^GI4#vI3!H@o$CB%n0_Ej zjDwTZ$+UG5TBQMJ!Y0m7(;eq=kvDB?tBNd#v}Xb7z;a1PmPb0V6zRToMTg^=!;seAG;j2D0 zbc}fdRZ-6^%LZT2o$fG;irjHq8Mnx^NLv<=b}XB;XE~$;%OxFI9_hqVq%+GWU09lQ XWd&JWe7OVD5T6x8;=5wh|6h)O#E2z1 literal 438 zcmY+wfZq zw5BZ_C0448jnF6zI1#pSD(v7)*u}Z9hYMkaOJN^Z!W!4Y0d6X;YlAlsLx>MKMEI%> zH67z1fikJ%7HPdN=vI4}MS1VIsf?Ri#dsKkp4CSO5S3 diff --git a/compiler/frontend/builtins/jet/Function14.kotlin_class b/compiler/frontend/builtins/jet/Function14.kotlin_class index 2479cdcd22e9cacb1ee54025d7424786647de4ec..5a5f192e16068a928897fd090b28f2e860a9a143 100644 GIT binary patch literal 469 zcmY+ literal 470 zcmY+=IS#@=429uLmdRurTq3Ge6sZtpN{+z+0D;)|RUi-u?!!$u5W#q)xcvUg&#IHY zMW&Sn{nW~2XoIN!EMUlN!-&~|F|!L3W)G&!5@yUk%$XG|m;+drTu~vM1q%^ed5Gc8 zLjuoo&`Lu$6=q}8{cUZ3gsL}sd0aeTP?Mos47X4#l0dCVHflq1P+O9V+L1ieo+MER hl8-u)6zW6@@}#)sB8VaKW*8wKhB5MGn6&;2^cUEwC>8(! diff --git a/compiler/frontend/builtins/jet/Function15.kotlin_class b/compiler/frontend/builtins/jet/Function15.kotlin_class index b1aa12b32f1e1c3ced9da0f37ba1e395686c0bfe..3d192712111935845c2e0a33b690d04b0d24b061 100644 GIT binary patch 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 literal 502 zcmY+=OAY~15QX8st#x0mA7>~=Ju)y7Lqp530EBqIpCN=0wqrv!qLsRd8h-z%PU&Xy zQsqcn=p+sKApJVMu%$M)lvI_yZoRD%=17 diff --git a/compiler/frontend/builtins/jet/Function16.kotlin_class b/compiler/frontend/builtins/jet/Function16.kotlin_class index 1d28919580b10a23274b651365b3550836411361..e6954406199e3be66b5ca2653f68a0bc05bf8d9f 100644 GIT binary patch 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 literal 534 zcmY+=J#NB45Qbr|ZI<<7ufH-%<%)s|QBrb@9DpFAkOY$OkBC4)phV#|+$$%*46_nb zK5sSinQn1X4QB%Mi=d%x2z7U{!n1IQfpCNu;TW&N6}$;+427#02^+i%C-}H=ZY$7r1+L0!(Il59~pA|-3DiX$3poPTJdF#hks@2&0ae#CwjWqHZG?LNS`c48nZ&u zgcXsdte7-oRY-G|CM{T1(voFJD^}9Z%3Hn^(-OCyHR8@QB_2F8;;*M89zFBU^*@{e D!X_=M diff --git a/compiler/frontend/builtins/jet/Function17.kotlin_class b/compiler/frontend/builtins/jet/Function17.kotlin_class index f3192b44ae155101f1623711f2f124e38f68afee..254c89761df1ed19c32ae8b4d1c4769d9533674f 100644 GIT binary patch literal 565 zcmY+=xo*Nx5QSl1N}lrj ztC^##{HTglTNvh6;e|HTMPr3qVH+`$a69_^t+5i9m literal 566 zcmY+=xlY4S5QSl1Z@J#CkGqJ<6@{ya(q$fl2LKerl7tsxor{PK%(lv4-mItuPkWI1_H*T-abD+{9GaVkR77F6^)nj&LCyo95I3GF@!c~c SZas72mnVonp6%oR?>m29Br>)D literal 598 zcmY+=%}&Bl5QgENwzP*sd-~CpVbzrjR>ozQT!t4Q1|t6BFGeGQNH7qM-V1kUJIqNs z%jaFqeEPK5slL@7Mupdpj1P5CTj5;T$3!^5g>Z;V;TEohBU}r|xDnR46>j6M;Y=I6 zDG@sOkRicBh7_MNSgd8pu#o}ymZ6K^X0STPuuyKNF&#^n$f1m#Yp0+aI diff --git a/compiler/frontend/builtins/jet/Function19.kotlin_class b/compiler/frontend/builtins/jet/Function19.kotlin_class index e087605b9924093fdb46b18425f93d835460a89f..6c14de8d0dc489b3530ec924e67f7c39358567de 100644 GIT binary patch literal 629 zcmY+=yG{a86ouhA!!R6%xh$YDR#RC}8B0nZ!v}z9!2A6YjYgx9U^E!%cn;srVYzq0 zF2BE8S$>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 literal 630 zcmY+=yG{a86ouhA!!R6%xh$YDR#RC}5lc!R!v|2K@e1OdXfzs)MuNd;<$L&a4$Hk0 zcKQ9)%JN&~uj}PLz-}4z;v|GyS=eFUIK+W*4Tr`Nj*RO#HjZ&(+`!P-V`SXK>5>bd z;MSSY!o3YC9&O0*Y(tJ$8w$MJ0L*M?V{StSU&|r)U2K<5k6Vux2X6j^eyzVVNUK-( zR^ue9-VCU*$WdpakUAIDs0&dd bWk$X!b8@OI$PXpRPi33@R(3Z2&*=UETCp|7 diff --git a/compiler/frontend/builtins/jet/Function2.kotlin_class b/compiler/frontend/builtins/jet/Function2.kotlin_class index e6c78dece17c302618de2120d1ab4fa357fae612..4ac0e9f25975094a7443f85afa90068cfe5ccffe 100644 GIT binary patch literal 101 zcmd-`Q`p6*#mB)Qkg33+#m2=Xz$gLYGYaIO@Rl}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 literal 662 zcmY+=NlF7z6ouh>l}hEMQq4&-5Jxp~kdZjd&}Fy)6~(?uVuzwAilQirLfnEYaB)_S z_d@RQ`$vc4SIb}5&wYT6GU&%i2sbyi!XdJ}GnZMOlzmdaodCn4O_*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 pWsAI4rsSa+#vS>R?1)yCn4O_*bZyPA=Zs+*f5T;XCoLxCq7fEOFuc(b8{4;#ApvZ05c$&mX#mP)7B&PC&k7e=9< znOz>H)$gm*aS~O32h_gEQ3s-sIuzBYBT+;hi|W*gD5g$D4eCtfsdG_tm{nUYoiHJ< pl`ZmCnUeR)jC@q)CMUzH%=m2L7<*&)A`UGi7ioBzM6{|5lDJFWl# diff --git a/compiler/frontend/builtins/jet/Function22.kotlin_class b/compiler/frontend/builtins/jet/Function22.kotlin_class index e8037f9d188a483be6c706cfd3cdae1c6e351d3e..e6a9574a47b237699fe843982af7f594bbe84b32 100644 GIT binary patch literal 725 zcmY+>NlF7z6ouh>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 AeENlF7z6ouh>l}hEMQq4(=II59@jKpDvF2ef zcOiH9{iDmdb}|1k-PC#*=3Y09e3+@R4VILBEGw6=q8wmVxr{aC5bMenY$#i7Dp#>J z;mk%jF)Gw>rbCPi9THsWkm5#%40k#J4?5KGq(cKQIyCX7Lkk}|wDC0=Qrkg4H?s9y zFy4IO*S9mXgI-)bVl*8_LGb{O+IBM3j+0OAI+dtBr-0gbDpLneA$90fp^ls^b?j8_ zCB-eL#xWw#g*Eb07?an+guE4|AB7;Fg>~{(*dX79P4ZLNBEN<0`TylQf9X>` At^fc4 diff --git a/compiler/frontend/builtins/jet/Function3.kotlin_class b/compiler/frontend/builtins/jet/Function3.kotlin_class index fd1e71d2c8bff113ce5909ea7771c05fe1604af1..70a8fc41694ae33a5cf7c58ad18c199761bc453c 100644 GIT binary patch literal 131 zcmd-`Q`pC-#mB)Qkg33+#m2=Xz$gLYGYaIO@R diff --git a/compiler/frontend/builtins/jet/Function4.kotlin_class b/compiler/frontend/builtins/jet/Function4.kotlin_class index 96acd462c99df6c6625dead4f6473f776f325ef8..785ebc0ae960cfc2e289a87e8c352e2b531249b6 100644 GIT binary patch literal 161 zcmd-`Q`pa_#mB)Qkg33+#m2=Xz$gLYGYaIO@R32LL(66{-LL literal 251 zcmd-`Q#j11#mB)Qkfp$&#m2=Xz$gLYGYaIQ@R32LM8i6}tcc diff --git a/compiler/frontend/builtins/jet/Function8.kotlin_class b/compiler/frontend/builtins/jet/Function8.kotlin_class index 40c39a2539e54e6e68d7cedf0d33daf8850212c6..6fd6d939693ba0cae76e6a1af7a611df72448d2a 100644 GIT binary patch literal 281 zcmY+;yAFat5JushWmzVKn7=euTUk&UOG+Pu2f%2&C*FNKUQ8IrV#=>Nhr85MJzqp`=yIK$aE;9{KPY8-JhE^s$yY!m(abr?U^Eiab4W-`1T=CKUJlM_8u cBzmg6=%va;Z&eU|RJrJ@ilSCktbQf#0sR>mL;wH) diff --git a/compiler/frontend/builtins/jet/Function9.kotlin_class b/compiler/frontend/builtins/jet/Function9.kotlin_class index 4a4a4abdc68f2c704d351dd637fb2adbc7fb8b21..0544ff80e6d7e42ad75c0cedcca1f0cc81f4cbeb 100644 GIT binary patch literal 312 zcmY+;yA8rX5Jl0Q^?E(F5PBgZ+K9jrA|#{?3NQlkNBpUPx+n~L7=j5;bT2pQLv^1W zmdVwz@}NOy!rItlW1L}Y9I!Lau{Vx57#BDiGfu`OnneGfN$9@jZ{pE-G3~Xpt6{7{ kJLyDc6^Sk?FS@ES(M=UZcU3NWsG{hpDnu_8&wkzV3kS9uy#N3J literal 312 zcmY+;yA8rX5Jl0Q^?E(F5PBgZ+K9jrA|#{?3IGJ+kNDF7ebE>8Fa#5x=w60Lls3&RUvw*c=GF(Uljiu(f|Me diff --git a/compiler/frontend/builtins/jet/Hashable.kotlin_class b/compiler/frontend/builtins/jet/Hashable.kotlin_class index 4263a02976d5214a9f551f651fed9851476ae22a..ad9dca5afb0d01a17df752aaec4f8c45fd64c6b4 100644 GIT binary patch delta 10 RcmXpoVBttp2%E^F0{{v&0tx^C delta 10 RcmXpoVBttp2%pHJ0{{v+0t)~D diff --git a/compiler/frontend/builtins/jet/Int.kotlin_class b/compiler/frontend/builtins/jet/Int.kotlin_class index ed3aa5b71c52ca9fb334463f4ade05bbc1481e0b..4809891b4a3fdb7f9a2c2fa87ae85e1e201722e0 100644 GIT binary patch delta 67 zcmeC;>EhXNfsyg(=8KGXn3Rq&T5)qQ2pngWV&P&EU~&SJQ4$<%1}C60o6ocGF>;)Q K@+LoJRRsV|+z?Ly delta 67 zcmeC;>EhXNfsygp=8KGXn3Rq)T5)qQ2%KP)V&P&EU~&SJQ4$<%1}C91o6ocGF>;)O K@+LoJRRsV}wh&eT diff --git a/compiler/frontend/builtins/jet/IntArray.kotlin_class b/compiler/frontend/builtins/jet/IntArray.kotlin_class index 788a47e3739cef9a398f5d57310ae19eb04539b6..f1d6018a1aafee605eb3615b2e1ef075f02f7fc7 100644 GIT binary patch delta 12 TcmZo;Y-42MU{g3Xk);U$5+ws7 delta 12 TcmZo;Y-42MU{g3fk);U$5-9^C diff --git a/compiler/frontend/builtins/jet/IntIterator.kotlin_class b/compiler/frontend/builtins/jet/IntIterator.kotlin_class index 3f5eff2a783..31b70146234 100644 --- a/compiler/frontend/builtins/jet/IntIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/IntIterator.kotlin_class @@ -1,7 +1,7 @@ -& Ì2 +& Ë2  R Æ0B 1Z 0B -Z &0ÍB +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 77972400a21228ac1ebe42a88687e78e9dc4ea9e..02d9b7719e100bbd70f5217cf482d678b4bad10d 100644 GIT binary patch delta 10 RcmXRfXW?K|I6IN07yu7l0`>p^ delta 10 RcmXRfXW?K|I5&}{7yu7p0`~v_ diff --git a/compiler/frontend/builtins/jet/IntRange.object.kotlin_class b/compiler/frontend/builtins/jet/IntRange.object.kotlin_class index 61c0310dc72..c422d0b6ef9 100644 --- a/compiler/frontend/builtins/jet/IntRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/IntRange.object.kotlin_class @@ -1,4 +1,4 @@ -† Ï2 +† Î2 R Â0B -3Z Æ0JB +3Z Æ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 85452e4ae47a8cb9131906a7662b4d8049ae0309..c949e8791bb1025799b625d495b60d58e3b13db5 100644 GIT binary patch delta 10 RcmXpoVBttp2%X5H0{{v!0to;B delta 10 RcmXpoVBttp2%E^F0{{v&0tx^C diff --git a/compiler/frontend/builtins/jet/Iterator.kotlin_class b/compiler/frontend/builtins/jet/Iterator.kotlin_class index a7cd1c9c2f136650aa29b17a7655bddd235c422b..cfe74350eab080fd15a3e16e5eee482878c0f6fc 100644 GIT binary patch delta 9 QcmXptogmM6exiaX01bfxumAu6 delta 9 QcmXptogmM6VWNU401br#u>b%7 diff --git a/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class index 02a795b6ca05858fe4e0f6b088cf574693560f64..06021dff700ac980d5c50b2df669a20cd841bb65 100644 GIT binary patch delta 33 mcmcDwm*z-QxWK5z$H5@Ls=%Pd#>FJSC;{R#3ZzYxRsjG{iUeB# delta 33 mcmcDwm*z-QxX7r*$H5@Ls=%Pd#>FJSC;{R#3ZzezRsjG{sRUgB diff --git a/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class index 7feb52f7905c5a7a6a336653e72cf7a114a0f8c7..5e00cdcf818458c594ddee3eaaa0ed78d228ed1b 100644 GIT binary patch literal 89 zcmd-`Q@F^e#mB)Qz^cHY#m2=Xz$gLYGYVv)@Rzq0BA-AZU6uP literal 89 zcmd-`Q@F&a#mB)Qz^cHY#m2=Xz$gLYGYVv(@Rzq0BH&aaR2}S diff --git a/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class index 84d15ad43120e9128cc184dc26134c3c7067fd96..6f83f4899a51053ddad0d7b2f30f63740311bea0 100644 GIT binary patch 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= literal 323 zcmY+;I}XAy6hu)!$97&E35`-wx=u;Kl0ZV@PdawVh6n{CO?OXs{m?!(Z#*EkFqax( z+n)_5al~2N;UZ4BiZgEFg1flKL+p5p2fV};i+IGb+5dO=rs3Zqn%u2a%*Bao1ILr;|x=0JpkQMUX3=|&G_ma$idSlpPh zhirc>IGOf1o33y%9dI=raWkE8H(ldlTJbd9;AJ}Fz3Pp&_{eJLwZpN<|G;jN<;i}~ aA?2`qag!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 literal 378 zcmY+!6+4_>y%WS2qYw40eU1Zz~#6Ppa8CtxSL$4k7S^keU hZ<()c2OVPa^EpQeRZu16sX#@lqLiwsL^V`Pbzd(i8JhqA diff --git a/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class index 6d9b2964213bc4be4a88a772dd336c7aa891f8cb..46d7867767600853f0a8f8172d874158a6e38d4b 100644 GIT binary patch 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)@ literal 405 zcmY+Z$YvadR7b diff --git a/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class index b7530952c07e69c30c387f82cf401d333814f166..9fc9cdde461e7cdae955511870ef43d24c1fc1c3 100644 GIT binary patch literal 431 zcmY+dlM5A58|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? literal 432 zcmY+t+9BdK tAEG8~2Kj$pzGXVU>b3WwobG3oP&rjlCFLkjRg_XS6{v=4sg8`Z6ao6d1CUEpZi;bgkR*|cIZUEyNd<7&FbZP8I1+{Fwn9(D+L y+9Be#9D)L4FaHnLZ<){7blN$e&vzu0P$`vBIaN@ODk-HZ%2PGfP%RaxNZ|{GejhXd literal 459 zcmY+=I|{;36olcNJZ?^Il6!|#mZ?+Px*r9>SJYk*1i`hq9+zV*9CEtvpK^5Fe`E-n zpy-pq`4qDFwP0&H#m;nwz3ChW(*=&E9Zsf8jHVT5(-khJJ+8BkTH_{WXmGbfi-#Qo zo_2_M&4-}CrkDQ-%ePE#tUB$S&!;~UN~n~|sGKS&N0pRP73Ha#YN(b9RHX0)tn?p8 diff --git a/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class index e9784a08a467acf73fbb2ec12bc6b550fb8af3ae..601807accadd9158b14829daa63599a3eb447b2c 100644 GIT binary patch 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=oRAlt?3jy(;4=r9S){*98D`urVE@+dt4^nXo;(sp~B4$HSTr@ zc-W!A(+gE5+{4L`>i%vV|)A68)5-O$=Dy1^YQ8}elL3ygADypUe)li_? EFQ>L4H2?qr diff --git a/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class index 28e7af74926465fef52ba2fbd81136394466bf6b..f074d14351afc4bc5b49f2102db9d856fd3621da 100644 GIT binary patch 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-jCUV1|Itqes?FB&)1i>SD3{PV$95UVaPdRSUeN11w z2w4~P*2gf@UmL8XW2~hUY@}0cr8DfLE%wqm4$=-s=>jKdkMpP-SK?x1sBqO`f}0LC z?m9Gh=m0!*Xz>~kwF_8w=6}=dZHB+*!3FEn;jxG^R7@pQN@bL#a>`K!<*AaYs0me5 J4F#&D!WZFuBPaj> diff --git a/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class index c38a6817dde80d1790a913a0c2387bc413c1e729..484df7e64db2e0c76a4ee6c5552bef869a6a0037 100644 GIT binary patch literal 539 zcmY+=ISRs10EFSZEH5wnBxx*Dr}O|GCm^_MF9?Dl2!hA*1fIrNIApr-pK{#LeN10E z4^ij!HuYg+ti1d{MukC?PDb!U@aYDBOPHYZLyP%v6pr@NGCW-r#Oweav9D>h8!0i3S4z4 zanqr~T?gQyLye~n4PN7+bS)O0`TsV3o8iD&;~JZW!-XDYD4zb?aT;}DGn|bK6I^u2 zan+%~O$XqvLy3nD6`nfOc#VhLHt1XP|8e#wgh1^@s6 literal 567 zcmY+=ISRs10EFSZtS^hnWGO6Dr}P5eMnQ1bUJwL95Cp-KS$P;^;gIRRf6B45_G7x- zItW^)3lkS+{A+`Sw2P&*hn2LCwRC`ubcn5Vgq^g-UOL7>I>B+!g-vlXGGsXGFv3NL z99JC*+;jl$I+S?mP~oXVjn{CXL>UM3*;)?N?XOQ+aKTWqDf*hy#DOZRa2>%#VNG&1Bk z>ELkIp}<84;HpE3n+_g#9R_&lFvRnJaCU^IGQVRdZ__?J_0}g@)P5XLh6mX>IE=*jQ!M6>j(k^Dw9_G?M7SaKh(jivT5!TWc8|fHZ=>)sK&TWdlk)el!4t*ST z$Z*mj$5{v9qCW1&&dvDD3|gmp9-ju aiYQCPR6?axkLptyl~bS!s-!BarkXbt`Y9p+ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class index 2813af53a6b05f6ad28363b6d32e6e89a6166536..cca688f4843da9d43488c54f953ad310f581642e 100644 GIT binary patch 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 literal 621 zcmY+=ISRs10EFSZtS?cM$tISmEj@yVQ4rj<7X(2N1VOM6Jes|yPzwjA`~E4%j+&?G zr`AExIQ=kjVS3*-m`J;rN_&_|`~-ki zphJqI4jE250B0R?Ty!XK)uF^qhYEKcYCQgj)OIm$%I|{;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~`lB9FI|{;36old2Jg-rcNqm;6Q@REBq9FLzUJwL95Cp+O5L}syZ~?}`!RfyF%X93g zc$qS>4uZld!`OxCf49Lzwu`B34>Q?5=CT7UWQSPFj#w4 p28S|~OL>$}1yo2yl%;A^Ox39d)ua+Cr9fp=PPM2u)uFmn?*rAzqXEDQBEN~VpoW%wJ3J?uW literal 193 zcmd-`Q+Uj%#mB)Qz^cHY#m2=Xz$gLYGYVv(@RzqXEDQBEN~VpoW%wJ4af~u diff --git a/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class index 4037b98dd7a7cf78e781b4f3ce53f389455fff8f..0d6ca995c3e88c01a15fe731405a48ea2e9c8ccd 100644 GIT binary patch literal 219 zcmY+-xeb6Y5Cu`MkG16heK{g@?2smCfEp|zarI0iK)_0y&5I`WdQ%&cL8zv2wxIDd tVO6%+lpS_uk3%`&RAyYt5xvs?o0j)GmsB|W_iUs{%1SvYFBPO%Dn7Dh4+j7M literal 219 zcmd-`Q+UFt#mB)Qz^cHY#m2=Xz$gLYGYVv(@Rp}fz y!fNcX88_IC0}kVe)0lA?C)~z@rO>}W&h^KXC373<6Q@O5UaQdxT2YI&l9s%WRuIDg literal 245 zcmY+;yA6Oa420o0B*vmZr&N@wDVc&PC_zHvxifnZ3M{$%zv@or{7~PDL(Hz{#)G=g zgw@z%Gp?{32OP!`r!nI)u5lX+mQ4TtFqI!;lEh6YPn;HMd96w-Xhkj7sKj~X_h{g4(@sQ7B z!D8&O8duni19szx!#LqI&bW*fU*j56k@shq@2|1bE;Zpkb1Y$bR>cae$V#ltQda#3 Dp*j+R literal 271 zcmY+;I}U^}5Cl<=vCZIM)gmHv>~L?f7XgH{Ke#jJ00LT?tX@_+mR;&Y9b$1cWe*uH z3l?LKw{e4yalqF&;%A)jH*T>SD>mZ}Q<3}UIiFvzUi*~8dFEKc@~nmxSdo=jElXM5 E0jQ%Ai~s-t diff --git a/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class index c9d75de90e5838d2ce6ecd313f462b4313b41dca..978b21df5c504fb0bb14263125584132e45f3971 100644 GIT binary patch literal 297 zcmY+;F%H5o5JXY0V>=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 literal 297 zcmY+;F%H5o5JXY0V>=rcXq1Z5b;=xrgMfsT0D(Jm4MLHTru(n^er;cyP9Bh3m`aVX z^WTQMIARfZSj7nsamG_z@Dlgf#E!Rkz(-thYj*t2+x~eOeJnNYr-5ax$m&>$m05+= Jvz#@s>JRZ_6i)yE diff --git a/compiler/frontend/builtins/jet/KFunction0.kotlin_class b/compiler/frontend/builtins/jet/KFunction0.kotlin_class index f61d27766b0b6aad6c765332abd2048872953317..e0dd98646fa8ceb435b95bb77029f0940d7e038f 100644 GIT binary patch delta 17 YcmY#Y<>p9Jc+RNB$H5?wHj!Hj033Y-H~;_u delta 17 YcmY#Y<>p9Jc)_T}$H5?wK9O4r033`1IsgCw diff --git a/compiler/frontend/builtins/jet/KFunction1.kotlin_class b/compiler/frontend/builtins/jet/KFunction1.kotlin_class index 0a969bf3e293f0a723cfb5f68d96c54eebc67eda..da5c15c649701da034aa55c1203d2abde0ce5a26 100644 GIT binary patch delta 33 mcmcDwm*z-Qc)_T}$H5?wslcGc#>FJSC;{R#3ZzYxRsjH6;snFJSC;{R#3ZzezRsjH76$IJ< diff --git a/compiler/frontend/builtins/jet/KFunction10.kotlin_class b/compiler/frontend/builtins/jet/KFunction10.kotlin_class index 86e18049fa11e75507ad65592ee601263f87f28c..1ba21e1dfa5e9fc3993928c0bfb6550edc9c10ae 100644 GIT binary patch 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 literal 297 zcmY+;F%E)26h+bb!!UfNFfUY=Q&YMQ*MW%%sHmG}6=2~@UUyG-eX5&{Cl9#SFy<0r z=bsI;IAReuc!(38;ubG)#wzac7CS!T9$#_6t=j+ZvL2t;!G~PZaT-|0imZl}SS>5F KI+n9~R@nh?Vid#x diff --git a/compiler/frontend/builtins/jet/KFunction11.kotlin_class b/compiler/frontend/builtins/jet/KFunction11.kotlin_class index 3f7daf9d401058d872e3288064d45825c05efc86..bdcfee8da4d9a0218f86ace28b2081fa75d101e6 100644 GIT binary patch literal 323 zcmY+;Jqp4=6h+~AlgZ>|0&+=ZIdw|+;Wh$-|5^&}*Ht7byl}hob;sxWvuWo6ry8bQ zB5c3ea27{g#0{?Egqygf@G0`-m-hyVZp literal 324 zcmY+;I}U>|5QJf`F=jCm8BtNXrp!HZ4Ui(`opco3mrH~c8L{2>Pc=H`Rfbj_&e;ty zc}V|j!Ns)4)pUWI>43ZG5)ac6Ptz4%rWJ3~H9osOXu=}9q16UcmjB`7yd6Jv+Qk&M V>y8r2Qw0^Ml8RJCDOFR6YQ7QS7MB13 diff --git a/compiler/frontend/builtins/jet/KFunction12.kotlin_class b/compiler/frontend/builtins/jet/KFunction12.kotlin_class index b34a42194c1733c83b1261217e8322917df7eaaf..b86e095d6081b8cece510a26b40f157517f74772 100644 GIT binary patch literal 351 zcmY+|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 literal 352 zcmY+WwD6#0(AI>!H&Yhb;dG+gX+? dyI%X4!g9t@LV2p70##CxswkyuDp3v9egOgG7;pdp diff --git a/compiler/frontend/builtins/jet/KFunction13.kotlin_class b/compiler/frontend/builtins/jet/KFunction13.kotlin_class index 6d0ca398bbc9c515af8b9d67e9aa5d68aeea9cfe..33c6b7e7972ca4b183f5e21efee7e8b955ad9414 100644 GIT binary patch literal 378 zcmY+y%uCTSP+Q4LuSPJqP6wgo07F`~K-hr~HwzSBG78 zV@w{h{4=Nz3RlyLo9P;N(+Q77ue8Ba%+TVs9D40AW%)na iyk)+&9dw8(%;y{>l&1y%uCTY!Yb8+s%pYA(th2nC~T_x;n2Zt_RQULAJX zjWK!1^4EgBX^(^H0!PyUC(|X)rXwzZUiD&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(bFm1GE<``w%_yN9l~bN7s6dsJQWX`cnrf()N?&mG94`O> diff --git a/compiler/frontend/builtins/jet/KFunction15.kotlin_class b/compiler/frontend/builtins/jet/KFunction15.kotlin_class index 78d60d6479fa24098837b306450e60c4903048b5..9121e41ca77875b7574b6a62db5839225fd4c51b 100644 GIT binary patch literal 432 zcmY+r`AX^-oyqt>{I85-Q}(Bff- zfTtZIUh^R+F!u64VfmKnja8?e^ZE2gLJ5^p8I@B7<*1TUs-iqqQw`Npfr=EqtO6hI literal 460 zcmY+=I|{;36olcNJZ?^Il6!|#mZ?*^6c?c&_|{$!1VL~ouFWMF3x}NU`==aT_8%F7 zCRq2$;Cu?1{aUawonmV`!_IV$z3Bo6(+)?|B~GRlXVVoflaA_f6*JVh*`dMR4lN#b z2zc5d;x!$D0;^vBFU;RE-m&Pkb3PvrNhqOGDx-3$pd3|FN>!AnYO0}HDo~Na7u1;` A0ssI2 diff --git a/compiler/frontend/builtins/jet/KFunction17.kotlin_class b/compiler/frontend/builtins/jet/KFunction17.kotlin_class index 71057118ac8a90c84b6e136872c7c03b8cdc614b..88ce7867c6a191c219b385b4637b3c0b2545dfc5 100644 GIT binary patch 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 literal 487 zcmY+=I|{;36olcNJZ?^I;>{$LW$Kh}#XTqpzO@$wK@bF28}NA(=j%t6KqYV*qP3-H|=mRo#SX)aWY-tJnC9KE@FlfS36X=*?DOFIODyfQ^P=Tr` GP|X+Q6Cv{e diff --git a/compiler/frontend/builtins/jet/KFunction18.kotlin_class b/compiler/frontend/builtins/jet/KFunction18.kotlin_class index 493ecfd90d72053d0360a5e1a4a2c85ce3b33483..27241db1188101b141a7bb115d064b10457cafc0 100644 GIT binary patch literal 513 zcmY+=I|{-;6ouhT9+R6%GC7&bGIdJV;u->iZ|wy^5ClPRMefKQ7z+=%-S?mJ$k2UE z?>FcuziyYD~ck$Lwq zy_X2fF6ym|VJ5#eSgDS&R-Is@I>lCXhMj7Qz3LnX)qPx# diff --git a/compiler/frontend/builtins/jet/KFunction19.kotlin_class b/compiler/frontend/builtins/jet/KFunction19.kotlin_class index 1f729e44f5af3747259d87fff4436c9c16d9dea8..29066c09c72f9222319cefbd154f9835913a5840 100644 GIT binary patch literal 540 zcmY+=ISRs10EFSZEH5vM$s}nkQ>XMUULhd3YcB|bAP9osr96!%FcuD(?)#@4*S8XMUUO_={*Ip0=K@bGNLwOr7U@ROm-Szq0GCP!7ytkO literal 89 zcmd-`Q~1KD#mB)Qkfp$&#m2=Xz$gLYGYaIQ@Rzq0GM3|8~^|S diff --git a/compiler/frontend/builtins/jet/KFunction20.kotlin_class b/compiler/frontend/builtins/jet/KFunction20.kotlin_class index d8a8be39272cb5ece101d93a5ead0ba15fe26ffa..3e14401b280fe75185f6c304c99e4c8d0a45c51e 100644 GIT binary patch literal 567 zcmY+=ISRs10EFSZtS>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-@M5RRkWGO6Dr}Q%3KtXWVUJwL95Cp-(b9obcwQ$IE-#_KpN&7Zk zZXL{8rwbDoX83D^xwMOgw1=g%kCk+QwRDJ$bcC(6#ZEfLzSo6Ka4<3qaMU5iNrwz) z9dcZBC~(yQxam;hu0w@~4mFXMao**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} literal 595 zcmY+=I|{;307TKeBqlG3CX*jnrcUW!~r6X*lV{HFAvk7)ahBo#( zba2oi#ZiY0Cmn#Z4mmD56u9b8;-*7|yAEAE{)g1|FsjY(>cP`|J|7mg2x9;9x3mob}^OhVJ6$hTy_Hs*#VZaL#$+5tYt^o{O#1n*cu5<>@>8n z*U-j6LxQ7*6ekV9Swn`4h8$N71#TKj+%;5q{D;JLFsjY(>;BVxP9Nkp4`TmwyF(eu jr98@~8dN}ql%*mnrkYfXYEuc7QlK&_rwXd1Dys7a|As60 diff --git a/compiler/frontend/builtins/jet/KFunction3.kotlin_class b/compiler/frontend/builtins/jet/KFunction3.kotlin_class index e5b587cd1d7a081bef0ef084deb3326e801397b1..a803022aedccad87c2030bdac3a99b29818b8d70 100644 GIT binary patch literal 115 zcmd-`Q~1uP#mB)Qkg33+#m2=Xz$gLYGYaIO@RhKIP literal 167 zcmd-`Q~1TG#mB)Qkfp$&#m2=Xz$gLYGYaIQ@RzqXEDQBEN~VpoW%wJZLSUI literal 193 zcmd-`Q~1rO#mB)Qkfp$&#m2=Xz$gLYGYaIQ@RzqXEDQBEN~VpoW%wJavcru diff --git a/compiler/frontend/builtins/jet/KFunction7.kotlin_class b/compiler/frontend/builtins/jet/KFunction7.kotlin_class index 2f1af84609335b91a3931efa446be787a975fbdc..a15a620d6422e9c2d10f6c7152f95818d110718b 100644 GIT binary patch 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 literal 219 zcmY+-sSbcJ5Jk~W_f(LVDr9vf--1R$Lc;p}2#R2mardYj=kiePqQY8K^+|*J&xB1_ rV;43!ge^{ChfCPw77kbn{l8&s-zmrJlWk|kMO>Q8a9J+L<+;KODpwDy diff --git a/compiler/frontend/builtins/jet/KFunction8.kotlin_class b/compiler/frontend/builtins/jet/KFunction8.kotlin_class index e0a91e393cc57e5c075abea59bc91cd833d507d6..96686639ecf096ffcf28610fe987402f8a82f7d6 100644 GIT binary patch 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 literal 245 zcmY+;y9$6X5Jb^zOxDFhhE$fRE&U+v6a?SjFQ|nJ+uc*m$e3?xYjK#fYq|2E<}+b2 x_E?PzY{mh*al~QFIE_nO#)2u+zu)!mk0D9oD!fme7HN5{LMv!RE!HZv`q9qNXojI1UJgZ{`R%9hsW+|)x E0Wm@o9{>OV literal 271 zcmY+;u?~VT6ouj5(v}N@IqBrsxuZ|yB!mP6_4$c)@FaKpzwOsYIi+6IVJWVr(L=63 z3sz%~&A7wUIAAx9IE)is#y#G~ijVPtsmTB5Hn*>P)||%B&Kyfvp4G7eE3y)+XDMs= E0y(e~DgXcg diff --git a/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class index 98ae9b42c024da916c520dc057f8a408785c4b63..1883836b5f318a002df52a197c053efff2f6d476 100644 GIT binary patch delta 33 mcmcDwm*z-Q_{XTl$H5@Ls=%Pd#>FJSC;{R#3ZzYxRsjH1WCV!- delta 33 mcmcDwm*z-Q_|K@t$H5@Ls=%Pd#>FJSC;{R#3ZzezRsjH1g9M8J diff --git a/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class index 533036eae5510ab637e9c08ceb11035b8bc7c641..cf778901048dc2f3bcfb007afabaa0dff324902d 100644 GIT binary patch literal 89 zcmd-`Q~1xQ#mB)Qz^cHY#m2=Xz$gLYGYVv)@Rzq0C&0uoB#j- literal 89 zcmd-`Q)pn);^SZtU{zqyV&h^GV3c44@)-rPQ20y&=?aW6c_SsDI#VGIAvP`+ph^Zf JixJLZ0su|Z1|R?c diff --git a/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class index 3f59b8289e6f42cb0fa99056e9755e92c78e3b9b..6821466ba18f8f8b097619d84c28e82e707c7189 100644 GIT binary patch literal 323 zcmY+;yAHxI5JXY0V>=s1LZeiau2WL*Ns*9vLrKA>=s1LZeiau2WL*NgyHdhK`0m#|oN*Hu+{GgvV#iZF;U%tki)S30{eO3#{=Hv(DK+);z%o{34Xnh< Otil>u&YD=2HU9wSm=&4; diff --git a/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class index 817981db4c68cd56ab1700941b89d33e5350f427..495cbe7114891f931397a573c54d9e22473c9670 100644 GIT binary patch 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 literal 351 zcmY+=rs3Zqn%u2a(RM<5~b4D^VC@5T+IYsyEu>EvsSF0mmZ$1G}%(C;LgK ZltcaED4{&nP=Sh6qFPF+j>=R|4L`b_7jOUo diff --git a/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class index 87fe1dcea5f24fc9ab6f1c20e142b287f2eb5c04..6c7b68ec377e93b38d7dbf74d3d4168609784ed9 100644 GIT binary patch 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 literal 378 zcmY+=t?!6+4F>XcNR2qYxl&?Dsn92qx^vfcMjH+q;BKM(2+=kk9J=v f*Y=~1DTi{-Q9^mDq5>7EMAej14V9^u>Ztw)xN#Xu diff --git a/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class index 41e48b7d88008e4037bf09a3503748a4b8d4e458..ff1fbe5af40c1f8e3a73ffccc729950afcac7039 100644 GIT binary patch literal 404 zcmY+PB`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 literal 405 zcmY+kR~SHPE*_#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 literal 432 zcmY+54K-f&e-+Z`%o-*WRy^j%Bg}XDNj|DQZ*H*hH9yfid3TT1NCZ`$EtI>*s;fs^SHXVV@R(-p3!6*tp0?xq7Ci%#0$DQ0N#vO|Z-4iRrV xBz%@bRA4vA|Ah5d<~KII_C6Hz9~mW-qjIXCO3G6erBqD?s-aq{qau|k`~V!Q9`*nL diff --git a/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class index ffe8e26233ce7c217d741a77993fbdb0e2291505..a0a3547fad70ad32e440b83d6532897a2786e0bd 100644 GIT binary patch literal 485 zcmY+=yAFat6og^U0?T2+WuUU8rnL5XNKCwIZ(^b`G4XkPJZYS8y6>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 literal 486 zcmY+=yAFat6og^U0?T2+WuUU8rnL5XG%@k6y@`p&#KhO}@uYFW>Aru;(N+I+L(~L$ zpA0@Y$Xv!2Y)m_BO{dtI&agL~<6zq3Xu813wBl^K#Km;Lb<&MixQQ8R-0d*K!wwNI zJ2ZIP0r*UZs4dpL{9jpoWxQwEY3D;W9+Xf*IVzlma3RL?8 D4&or> diff --git a/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class index 8f2e9a3dce74e0a72547830cdde1369c40853453..f50a2473a9769a24ce5720e31e38002aec1a0ffe 100644 GIT binary patch literal 512 zcmY+=y9&ZU6olcNO|sc+lFei*%hW0DeVu^dU3)~QMJQKb&0cTkBjOG*IBo&#!b}F;I4;& zryg3o^Z>l|(BU&5f{Pe?`MK%x@dhi9hOi+87ieRDyJ+}P>w1oPgPV+HB_Kl I3RFkM9}`0&!TeL>H~k#>Wy$C_|-GM&*>H3d&I><*ACQsfG$v JOM&XB_ya&4BG&)_ diff --git a/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class index 8d0504aed7ad197cd135b8f72d9ab6213c2e5545..3923d37f7da4822f185bb46e88cc60e426c0a8c1 100644 GIT binary patch literal 539 zcmY+=I|{-;0EFReo|}i8$)>SPozeq%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 literal 540 zcmY+=I|{-;0EFRe9-GZ3CX=MGOr6pLcpL@6xAuY{1O!3wRvyYU4w>%zryRHHhOjSP zfTRn0>qD5i8QWkZ9bzjTVJ979FP-2ZZE=)Nagug8OJ}%9dt4`7xg0kmLxH;vGdy%C zG3Zd?sRQuRp~hQ>2A}Crx)$rs{C`_~&3NFlagFuycws;pDx@MRrV`3hDdnh)@>EV0 P)Ql>riUL(r4b}btu_7eT diff --git a/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class index 76fe1a1a456dd7c952c0b45033e8dbf953586712..e307f1ca0e3974f816a190984b2031f09a16dd75 100644 GIT binary patch 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 literal 567 zcmY+=ISRs10EFSZtS|dyDJ)Z`^a9>SL2%bz5ClaK1i_Pe9@98vy6>NI?7X|XePJC0 zozsVj3o|i88!V+=tfW1xrG0Fq18k*3?4%>?r7aH9F^se&pgP!&~E4b}btV#X%S diff --git a/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class index 8af1f47e565980d34ebc41f12a6b38e2f673e793..9e823e3dd4587b88fe385fe9954fd3d2d4bc3260 100644 GIT binary patch literal 115 zcmd-`Q|MyS;^SZtU{zqyV&h^GV3c44@)-p(QTR*(IVgN)fiwk1n0g}}pgsp74k0!! Q7NAZBIExX^VuG`n0V5a(-T(jq literal 115 zcmd-`Q|M;W;^SZtU{zqyV&h^GV3c44@)-rPQ20y&xhQ;Qfpi5%n0g}}pgsp74k0!! Q7NAZBIExX^VuG`n0VHDw;s5{u diff --git a/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class index 2ed4a2ed8b17e538707e35b1ffa0fa0d2e91fa1a..49ec33e2654f2b4f6de9419d4c0c217dc1837a97 100644 GIT binary patch literal 593 zcmY+=ISRs10EFSZnB`?L8DA2xOr6pjco{)(*Ip0=As`5Xg_rXvrg3n(@1Jt)qV4^z zupYwJ>!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@ literal 594 zcmY+=I|{-;0EFReOyXvv$+#w9nL4F6@G=U5Z|wy^5CVcASa>*(Vj2gh`~E4%&g(X8 zavLD7gC=ny%*1qUu#^t5lI~$G9bqFKV=J9tC*8+h+TtLc;wbHK`s>1GI2#!Txacs% zRfilm9SXEM0CycmcOr8stsVzN%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 literal 621 zcmY+=ISRs10EFSZtS?cM$tISmEj@yVQ4rj<7X(321VOM6yq~8qjf2yD|CD1V&D9;I z)9ZEcPsPNLE#`}LrZ6DLd{H`8-O#At`utk{o?duL@D3|gm gp9-juiYQCPR6=#AF4dz_Dx*NI|{;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 literal 648 zcmY+>I|{;36old2Jg-rcNler-wWV8dFA9Qh?FB&)L_rWN1i>}B0Mj@)-8X-EjvZGQ zcaT^ILFEj>*oEnvdK*k-yO_!LFqiFPAv?fQc8Hbi2y59E8`%wPWyje4?bJ50HxgPn zXlUc8A;C#Qin9jbsv*NoLyo(K4jvi`JT;VfY3Snp9}?Tcq%yzT4?m`U!YH?S82j}b o9Li8GX;^SZtU{zqyV&h^GV3c44@)-rPQ20y&xhQ;QfjksGi$J;pBTT=M8PFUT YAr2unE*79k3~&}BoW%rZF~eCb04uQxnE(I) diff --git a/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class index 3f1ac32694bb6efa386613f1a455968f742b20b7..fb219775d1e9ce9680aaa019c93cee9770e26d27 100644 GIT binary patch literal 167 zcmd-`Q|M>X;^SZtU{zqyV&h^GV3c44@)-p(QTR*(IVgN)fm{?mi$ERzqXEDQBEN~Vp0AcP6M*si- literal 167 zcmd-`Q<%V{#mB)Qz^cHY#m2=Xz$n28UQ literal 219 zcmY+-xeb6Y5Cu`MkG16heK{g@?2smCfEqwT;%bG8al%TQ&5I_j^|ftC2BDh9*@8yu uChW=~Sdv+{%ncIby5y|E8sX=aLF%-_J&hq^y*a@=`&HrQ!#2+YY_} diff --git a/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class index 46600f7e68d3c60ee2f26d251ad16ebfb6e5772e..5de9342532cc412e6655bead747b3103e41ec62c 100644 GIT binary patch literal 245 zcmY+;D-M7#5QO1wpPLFYK_ROvIR&RcHX-486;4bIo2>gkHN&mEwhn9%im5SM&_vyY yP1#~sb~uzhPUV10IpS7Mc$68f(7!*g{l_x$7_;wBj1);(DJSKnf>e}BQv3lz!w_-+ literal 245 zcmY+;D-M7#5QO1wpPLFYK_ROvIR&RcLPEmxDqNTvHd*(7YKE8c+S;)}D5l12K?5}t yHf4)l+2K(3IF$n~<%nB3;ZbI+h5r3Y{m_CKS DOl=Y| literal 271 zcmY+;I}U^}5Cl<=vCTk$T11473AqIq0ffYF_bMECooq{!)yqnk{Q9v|hnU@%S`Qhd zSg;#=9L5z+@TJgZ^_R%9hs%~DqL E15?%#I{*Lx diff --git a/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class index ef7730b317a2ce52f640b27ceb23d34c5ad06cde..62a93e084604db7efb4ab05ac5eaf0bbf6a18bc1 100644 GIT binary patch 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$< literal 297 zcmY+;I}XAy6hu)!$97&^piwGH*C|;>77`>Reu1s9-?(9<>F(*SZ|xVClLzD$mQo|^ zY~6;NIN~lI@DL|F#ThSg!CO3H7dt-U314x=wb}pgviHw*_PNy5PXo(Xku|UqE3*n~ JWI1bM)dQ4V6aD}I diff --git a/compiler/frontend/builtins/jet/List.kotlin_class b/compiler/frontend/builtins/jet/List.kotlin_class index 2b7b5872d70477548e33e143da69e5aa81f7cad1..f49fc5aff483f1b9b873b1484eee6e026e6feaa9 100644 GIT binary patch delta 189 zcmbQkJcpT^BTZo{lNKKbgFwhcZdJzciH5@L5mq8Ve&j@NQ<-T@Ry;sMUe2s4|+zkn5?*g o#?EGv0-Fcs%z<*ix{{D|i2!v)PYz&IW{(0 q;s$D)!z2YZ56qbh<$!f1A?XqU>WY~hz^Kd~VEhXNfsyg(=8KGXn3Rq&T5)qQ2pngWV&P&EU~&SHf>9D2Yz8NwGMmq{@G)|n Lgz_doWmN?LPrMLb delta 67 zcmeC;>EhXNfsygp=8KGXn3Rq)T5)qQ2%KP)V&P&EU~&SHf>9D2Yz8NxGMmq{@G)|n Lg7PLmWmN?LP?iv7 diff --git a/compiler/frontend/builtins/jet/LongArray.kotlin_class b/compiler/frontend/builtins/jet/LongArray.kotlin_class index 1a08d9d0799e51f193ccd0e9a321a19a1fbb4ef0..4ddc7e141ed554810b21d63c5e7c136e5d185ec2 100644 GIT binary patch delta 12 TcmZo;Y-42MU{hE)k);U$5rG2v delta 12 TcmZo;Y-42MU{hE$k);U$5rqQ! diff --git a/compiler/frontend/builtins/jet/LongIterator.kotlin_class b/compiler/frontend/builtins/jet/LongIterator.kotlin_class index 4073b3ef6d3..9315758d71b 100644 --- a/compiler/frontend/builtins/jet/LongIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/LongIterator.kotlin_class @@ -1,7 +1,7 @@ -& £2 +& ¢2  R Æ0B dZ 0B -Z &0¤B +Z &0£B  \ 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 0d70037d352c8539cd32803faf73bbb06b5be793..caa9ff3a8576c0de793ca1a9d5072efc58eab767 100644 GIT binary patch delta 10 RcmXRfXW?K|STd2N7yu5r0?hyb delta 10 RcmXRfXW?K|SUQoV7yu5v0?q&c diff --git a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class index 6c221b27022..feab5fccf57 100644 --- a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class @@ -1,4 +1,4 @@ -† ¦2 +† ¥2 R Â0B -fZ Æ0JB +fZ Æ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 fb73fb930789b1f7e335fd02107656a918899925..1bd74cbc94bf0b0ecdaacf8d57aaf08370fd84c7 100644 GIT binary patch literal 75 zcmd-`Q&`8O#m~VYu$)POQHza>Nq|v;5h%bYumVZIhy^I28pX?@X0VaTiH(Z|D9-@q IZh~Nq|v;5h%bYuo6kYhy^I28pX?@X0VCLiH(Z|D9-@q IZiaCg0ao}3j{pDw diff --git a/compiler/frontend/builtins/jet/Map.kotlin_class b/compiler/frontend/builtins/jet/Map.kotlin_class index 77989d89dac5797f37c2cc5a421500e68c1de0f8..2b3383bd406aeaa46bfe77c38d2b9571aacde8c6 100644 GIT binary patch literal 243 zcmZ9G%L>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 literal 243 zcmZ9G%L>9U5Jj6y2}7tF140`RvZ|1kxRNgO8F8=pWxi4W&`GQnx|(6m;ohOWJHbz= z&}Vq5phYeGjD)_xiQi#UCa`@XT58uCQZYqXN#3hSr98X!}$D(4q>+2T0zYwN5bI8hy%nD*s-e0BtmwW*E!5QWN diff --git a/compiler/frontend/builtins/jet/MutableCollection.kotlin_class b/compiler/frontend/builtins/jet/MutableCollection.kotlin_class index c923f5250e5f226cea80c97d045e1e68cdd112aa..778161563a0ca77d5ff230be78407a4af7054d19 100644 GIT binary patch delta 104 zcmeyy_>Ga9BTZp5lNJvLgFwhcZe5P8Ojf)=_O^)*A{^V9tVDq9$cZu1j5{V)C@Jq^ lvH~d#mtx~$5@3{IbYcP098roKY6iPuY9EO4f(7;<1OTC}73Tl| delta 104 zcmeyy_>Ga9BTZoolNJvLgFxs+Ze5OTOjf)=_V$SmA{;xItVDq9sEIMsj5{Y*C@Jq| lvH~fLkYeLv5@3{IbYcP098roKY6g2?Y9EO4f(7;>1OTLS74!fA diff --git a/compiler/frontend/builtins/jet/MutableIterable.kotlin_class b/compiler/frontend/builtins/jet/MutableIterable.kotlin_class index 2b57c2e1194c7488790d3ddbabb7697536ca4ff2..2a20acdd15978aad496020954bb9d58a7849a79d 100644 GIT binary patch delta 10 RcmcDvX5mOv*fNpD8~_Z70*L?s delta 10 RcmcDvX5mOv*gBEL8~_ZB0*U|t diff --git a/compiler/frontend/builtins/jet/MutableIterator.kotlin_class b/compiler/frontend/builtins/jet/MutableIterator.kotlin_class index e15f96561266eaffee394f4d6d5dbad48cf0395f..31e207fadad39f952779f08cd8260c2c21ed1125 100644 GIT binary patch delta 19 acmXpqV&Oq?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 literal 486 zcmd-`Q`pC(#lyiM5URz-#U#Ke!Dz$>q?3d=gxI)PI2Z*O!2BEpKT3*2&0rgo6)#ZJ zb|xvPDkm18E{-TQh#VJCj#~;O1W~siRULbjB2e89CMyx3x+p1-g=z>3phoFJlpq_0 zPdPVG`A#OVUiK(aAZI3%6Ug9Pgu!52XEIqK8Hu4p5~y=GsuHLVqo7itz={BR8yr|r zw}QO02h%&~O7`Mcq7F1g0NHimFh&YHm`n753THD}aRXg4hY1?YAkJJU2kfgngvS9~ Ck1)Of diff --git a/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class b/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class index fd82b5646867b44738673abd6c809f6ae7e2a028..91a56c4689255f6ea3f1fc38b9f3a987e17ca457 100644 GIT binary patch delta 87 zcmbQlIEj&kBTZrdL>3c{txQ(D91H^6COU}Noo94n;bIcth~nW;Gmvp&<6_}p6kv$r Y2J&_>fu-1^B!L_Oh!!R(s0xS_0MddDQ2+n{ delta 87 zcmbQlIEj&kBTeDJL>3c{ZA@0Y91H^6Cpw7OU0`%#;bIcth~nW;Gmvp&<6_}p6kv$r Y2J&_@fu-1^B!L_Oh!!R(s0xS_0MpM6R{#J2 diff --git a/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class index df74a5f8d045ab5c200698cc05ec2e73ff78fd16..94b3bd3c8bba15102260d029a0019b376cdf5450 100644 GIT binary patch delta 57 zcmYdDkm5*FIK-sI%fTS9oJos~i%Eb{f)U7N6j(7)N>Ab#lNAq8N>GZ8iv=jg=mez! D2|EX4 delta 57 zcmYdDkm5*FILxHQ%fTS9f=P>wi%Eb{f)U7N6j(V?N>AcAlNAq8N>GZ8iv=jg=mez! D3C{;- diff --git a/compiler/frontend/builtins/jet/MutableMap.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.kotlin_class index 26913052a202e6d4498651803442409f6e450923..7a4600f828a79e0a67049bd3d886d961ae3f18b9 100644 GIT binary patch delta 157 zcmZ3)w1`QHBTeA|lNK)rgTQhoEjBJD0Y(W%AeT{K#Y8C;(L+p8+#G5KJD8kUfKu#H z>Ojt#iNPB3>zSPRfFk)q971edEI{Q9Q93}m!%S8nqgG9vrN(iD$x0E(K05J)hS4sl bIFl6A3MUS*E}&&mqCkBcAjajujbj7=&bt~% delta 157 zcmZ3)w1`QHBTeBTlNK)rgTM+VEjBJD0Y(W%AeT{KOjugiNPB38Ga9BTeBTlNJvLgFwhcZe5P8Ojf)=_O^)*A{^V9tVDq9$cZu1j5{V)C@Jq^ lvH~d#mtx~$5@3{IbYcP098roKY6iPuY9EO4f(7;<1OTS(74-lB delta 104 zcmeyy_>Ga9BTeBDlNJvLgFxs+Ze5OTOjf)=_V$SmA{;xItVDq9sEIMsj5{Y*C@Jq| lvH~fLkYeLv5@3{IbYcP098roKY6g2?Y9EO4f(7;>1OTbC76JeO diff --git a/compiler/frontend/builtins/jet/Nothing.kotlin_class b/compiler/frontend/builtins/jet/Nothing.kotlin_class index 72c676ad4ff..a3c038ba10f 100644 --- a/compiler/frontend/builtins/jet/Nothing.kotlin_class +++ b/compiler/frontend/builtins/jet/Nothing.kotlin_class @@ -1,2 +1,2 @@ - ÈR Â0B + ÇR Â0B r \ 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 ca6bd5d7278591a0ccfbbe096eedb240f6b2fbd1..1b5329373abdc15a8677d48d2e5eb3dd8b5173e4 100644 GIT binary patch delta 16 XcmebA;o?YBaMa@FU=TPlk;@4H8f^n) delta 16 XcmebA;o?YBaMa@FU=TPtk;@4H8gT<< diff --git a/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class b/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class index 6c44770990f..f29fe2e81a5 100644 --- a/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class +++ b/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class @@ -1,3 +1,3 @@ -f Ê2 -Z æ0dB +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 9c2b060a59f1eb8e6befd67026cb8c34e2b92dd7..27ec7e0024fc0b8916d272cef3174c229d05e92e 100644 GIT binary patch literal 49 wcmd;JQ#i$B#KOfSP#h%Aag5P`*@}yUK_FQQB&6&FB1@vUIj#v9B!fB10KLHnhyVZp literal 49 wcmd;JQ#j3J#KOfSP#h%Aag5P`*@}yUK_Ep6B&6&FB1@vUIj#v9q<}ff0KO0hivR!s diff --git a/compiler/frontend/builtins/jet/Set.kotlin_class b/compiler/frontend/builtins/jet/Set.kotlin_class index 0be90038f8ee7211c6abebcf488865b83fea85cc..80c1cfe401231eb9b0854c3ef58923245d9210c9 100644 GIT binary patch delta 56 zcmaFJ_>hsCBTZo~lNKKbgFwhcZdJzciH5@L5mq8Ve&j@NX~w9D>AH;36Q?S(M_Y*j K1!E@eR{{WcbPaI; delta 56 zcmaFJ_>hsCBTZo)lNKKbgFxs+ZdJyJiH5@Lkyau=e$+&7X~yV@>AH+D6Q?S($5@F0 K1!E`fR{{WdS`B&t diff --git a/compiler/frontend/builtins/jet/ShortArray.kotlin_class b/compiler/frontend/builtins/jet/ShortArray.kotlin_class index 87ac873d20cad8ccaff130c148006555b2ee065b..a7c5cd23081ab97b16d2da979ffd140e9121dfdf 100644 GIT binary patch delta 12 TcmZo;Y-42MU{g3fk);U$5-9^C delta 12 TcmZo;Y-42MU{g3Vk);U$5-kHH diff --git a/compiler/frontend/builtins/jet/ShortIterator.kotlin_class b/compiler/frontend/builtins/jet/ShortIterator.kotlin_class index 5134e89a15a..dcc22417bfe 100644 --- a/compiler/frontend/builtins/jet/ShortIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/ShortIterator.kotlin_class @@ -1,7 +1,7 @@ -& Í2 +& Ì2  R Æ0B vZ 0B -Z &0ÎB +Z &0ÍB  \ 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 255372cce91f09bb122ba30a757c24570680d7b4..1b206b8e955a09bbfc7abf0f0b5a3332bac6833c 100644 GIT binary patch delta 10 RcmXRfXW?K|I5&}{7yu7p0`~v_ delta 10 RcmXRfXW?K|I6sl47yu7t0{8#` diff --git a/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class b/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class index 820e2a637f2..c8464866ee7 100644 --- a/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class @@ -1,4 +1,4 @@ -† Ð2 +† Ï2 R Â0B -xZ Æ0JB +xZ Æ0IB  \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/String.kotlin_class b/compiler/frontend/builtins/jet/String.kotlin_class index dcb65015e6b76706e659207e990e1903f9de7822..7fd163631aa9822c03ebbf2de58a7f32dd6bde4e 100644 GIT binary patch delta 30 lcmZ3?xR{ZJgH0i5B8v{=g^7l)i~$qNRoMfbSh$!3lmT*k2EhOT delta 30 lcmZ3?xR{ZJgH0iLB8v{=#fgTljDZu&RoR1_Sh$!3lmT+J2E_mX diff --git a/compiler/frontend/builtins/jet/Throwable.kotlin_class b/compiler/frontend/builtins/jet/Throwable.kotlin_class index a9138f6b8f7..696784bf612 100644 --- a/compiler/frontend/builtins/jet/Throwable.kotlin_class +++ b/compiler/frontend/builtins/jet/Throwable.kotlin_class @@ -1,8 +1,8 @@ - Ò2 -R)Æ0: Ó -#: Ô + Ñ2 +R)Æ0: Ò +#: Ó zB -zZ 0ÕB -zZ 0ÖB -#Z 0×B +zZ 0ÔB +zZ 0ÕB +#Z 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 90ee04dff20..3a9b86d6fb1 100644 --- a/compiler/frontend/builtins/jet/Unit.object.kotlin_class +++ b/compiler/frontend/builtins/jet/Unit.object.kotlin_class @@ -1,4 +1,4 @@ -† Ø2 +† ×2 R Â0B -{Z Æ0ÙB +{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 f1e534c10ae..c06c58efc87 100644 --- a/compiler/frontend/builtins/jet/atomic.kotlin_class +++ b/compiler/frontend/builtins/jet/atomic.kotlin_class @@ -1,3 +1,3 @@ -† Ú2 +† Ù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 4addb39e910..d221fae70c4 100644 --- a/compiler/frontend/builtins/jet/data.kotlin_class +++ b/compiler/frontend/builtins/jet/data.kotlin_class @@ -1,3 +1,3 @@ -† Û2 +† Ú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 1e0ea4bf81a090cd7c68bc8f08870e40a62416df..effcb6ef110421a09effbce8943dae64a1c65cdf 100644 GIT binary patch delta 11 ScmY#YW#wpNQn)>lRRI7EAOev9 delta 11 ScmY#YW#wpNQn)jbRRI7EBm$BE diff --git a/compiler/frontend/builtins/jet/volatile.kotlin_class b/compiler/frontend/builtins/jet/volatile.kotlin_class index 4a450111553..a4347382bdb 100644 --- a/compiler/frontend/builtins/jet/volatile.kotlin_class +++ b/compiler/frontend/builtins/jet/volatile.kotlin_class @@ -1,3 +1,3 @@ -† Ý2 +† Ü2 |R Æ0B € \ No newline at end of file diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractClassResolver.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractClassResolver.java index 4fc4e235f3f..1caebfbb5a8 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractClassResolver.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractClassResolver.java @@ -45,12 +45,6 @@ public abstract class AbstractClassResolver implements ClassResolver { public ClassDescriptor resolveNestedClass(@NotNull ClassDescriptor outerClass, @NotNull Name name) { return findClass(getClassId(outerClass).createNestedClassId(name)); } - - @Nullable - @Override - public ClassDescriptor resolveClassObject(@NotNull ClassDescriptor outerClass) { - return findClass(getClassId(outerClass).createNestedClassId(getClassObjectName(outerClass))); - } }; this.findClass = storageManager.createMemoizedFunctionWithNullableValues(new Function() { @@ -109,8 +103,5 @@ public abstract class AbstractClassResolver implements ClassResolver { return null; } - @NotNull - protected abstract Name getClassObjectName(@NotNull ClassDescriptor outerClass); - protected abstract void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor); } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java index 258392a4ba9..c4192020b92 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java @@ -43,7 +43,7 @@ public class ClassSerializationUtil { @NotNull @Override public DescriptorSerializer getSerializerFor(@NotNull ClassDescriptor classDescriptor) { - return new DescriptorSerializer(DescriptorNamer.DEFAULT); + return new DescriptorSerializer(); } }; @@ -100,24 +100,23 @@ public class ClassSerializationUtil { } @NotNull - public static ClassId getClassId(@NotNull ClassDescriptor classDescriptor, @NotNull DescriptorNamer namer) { + public static ClassId getClassId(@NotNull ClassDescriptor classDescriptor) { DeclarationDescriptor containingDeclaration = classDescriptor.getContainingDeclaration(); if (containingDeclaration instanceof NamespaceDescriptor) { NamespaceDescriptor namespaceDescriptor = (NamespaceDescriptor) containingDeclaration; - return new ClassId(getPackageFqName(namespaceDescriptor, namer), FqNameUnsafe.topLevel(namer.getClassName(classDescriptor))); + return new ClassId(getPackageFqName(namespaceDescriptor), FqNameUnsafe.topLevel(classDescriptor.getName())); } // it must be a nested class ClassDescriptor outer = (ClassDescriptor) containingDeclaration; - ClassId outerId = getClassId(outer, namer); - return outerId.createNestedClassId(namer.getClassName(classDescriptor)); + ClassId outerId = getClassId(outer); + return outerId.createNestedClassId(classDescriptor.getName()); } @NotNull - public static FqName getPackageFqName(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull DescriptorNamer namer) { + public static FqName getPackageFqName(@NotNull NamespaceDescriptor namespaceDescriptor) { if (DescriptorUtils.isRootNamespace(namespaceDescriptor)) return FqName.ROOT; NamespaceDescriptor parent = (NamespaceDescriptor) namespaceDescriptor.getContainingDeclaration(); - return getPackageFqName(parent, namer) - .child(namer.getPackageName(namespaceDescriptor)); + return getPackageFqName(parent).child(namespaceDescriptor.getName()); } } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorNamer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorNamer.java deleted file mode 100644 index 1d746a578fa..00000000000 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorNamer.java +++ /dev/null @@ -1,44 +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.descriptors.serialization; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.name.Name; - -public interface DescriptorNamer { - DescriptorNamer DEFAULT = new DescriptorNamer() { - @NotNull - @Override - public Name getClassName(@NotNull ClassDescriptor classDescriptor) { - return classDescriptor.getName(); - } - - @NotNull - @Override - public Name getPackageName(@NotNull NamespaceDescriptor namespaceDescriptor) { - return namespaceDescriptor.getName(); - } - }; - - @NotNull - Name getClassName(@NotNull ClassDescriptor classDescriptor); - - @NotNull - Name getPackageName(@NotNull NamespaceDescriptor namespaceDescriptor); -} 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 507794e0e37..aa9a6dfd318 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 @@ -49,12 +49,12 @@ public class DescriptorSerializer { private final Interner typeParameters; private final Predicate isSpecial; - public DescriptorSerializer(@NotNull DescriptorNamer namer) { - this(namer, Predicates.alwaysFalse()); + public DescriptorSerializer() { + this(Predicates.alwaysFalse()); } - public DescriptorSerializer(@NotNull DescriptorNamer namer, @NotNull Predicate isSpecial) { - this(new NameTable(namer), new Interner(), isSpecial); + public DescriptorSerializer(@NotNull Predicate isSpecial) { + this(new NameTable(), new Interner(), isSpecial); } private DescriptorSerializer(NameTable nameTable, Interner typeParameters, Predicate isSpecial) { diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java index f922caf2c2c..f84ba3be4ad 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java @@ -51,13 +51,10 @@ public class NameTable { } }; - private final DescriptorNamer namer; - private final Interner simpleNames = new Interner(); private final Interner qualifiedNames = new Interner(QUALIFIED_NAME_BUILDER_HASHING); - public NameTable(@NotNull DescriptorNamer namer) { - this.namer = namer; + public NameTable() { } @NotNull @@ -77,7 +74,7 @@ public class NameTable { public int getFqNameIndex(@NotNull ClassDescriptor classDescriptor) { QualifiedName.Builder builder = QualifiedName.newBuilder(); builder.setKind(QualifiedName.Kind.CLASS); - builder.setShortName(getSimpleNameIndex(namer.getClassName(classDescriptor))); + builder.setShortName(getSimpleNameIndex(classDescriptor.getName())); DeclarationDescriptor containingDeclaration = classDescriptor.getContainingDeclaration(); if (containingDeclaration instanceof NamespaceDescriptor) { @@ -103,7 +100,7 @@ public class NameTable { public int getFqNameIndex(@NotNull NamespaceDescriptor namespaceDescriptor) { QualifiedName.Builder builder = QualifiedName.newBuilder(); //default: builder.setKind(QualifiedNameTable.QualifiedName.Kind.PACKAGE); - builder.setShortName(getSimpleNameIndex(namer.getPackageName(namespaceDescriptor))); + builder.setShortName(getSimpleNameIndex(namespaceDescriptor.getName())); NamespaceDescriptorParent containingDeclaration = namespaceDescriptor.getContainingDeclaration(); if (containingDeclaration instanceof NamespaceDescriptor) { diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NestedClassResolver.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NestedClassResolver.java index 45d5f4e4bc2..dec0b3d60e1 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NestedClassResolver.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NestedClassResolver.java @@ -8,7 +8,4 @@ import org.jetbrains.jet.lang.resolve.name.Name; public interface NestedClassResolver { @Nullable ClassDescriptor resolveNestedClass(@NotNull ClassDescriptor outerClass, @NotNull Name name); - - @Nullable - ClassDescriptor resolveClassObject(@NotNull ClassDescriptor outerClass); } 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 35a076dadac..07a60472720 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 @@ -268,7 +268,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements return classObject; } - return nestedClassResolver.resolveClassObject(this); + return nestedClassResolver.resolveNestedClass(this, getClassObjectName(getName())); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java index d0749ef7fe4..653d31fad06 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java @@ -3,50 +3,51 @@ package org.jetbrains.jet.lang.types.lang; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.descriptors.serialization.ClassId; import org.jetbrains.jet.descriptors.serialization.ClassSerializationUtil; -import org.jetbrains.jet.descriptors.serialization.DescriptorNamer; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; 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.ArrayList; +import java.util.List; + public class BuiltInsSerializationUtil { - - public static final String BUILT_INS_DIR = "builtins"; - public static final String CLASS_METADATA_FILE_EXTENSION = "kotlin_class"; - public static final String PACKAGE_FILE_NAME = ".kotlin_package"; - public static final String NAME_TABLE_FILE_NAME = ".kotlin_name_table"; - public static final String CLASS_NAMES_FILE_NAME = ".kotlin_class_names"; - public static final Name CLASS_OBJECT_NAME = Name.identifier("object"); - - public static final DescriptorNamer BUILTINS_NAMER = new DescriptorNamer() { - @NotNull - @Override - public Name getClassName(@NotNull ClassDescriptor classDescriptor) { - return classDescriptor.getKind() == ClassKind.CLASS_OBJECT ? CLASS_OBJECT_NAME : classDescriptor.getName(); - } - - @NotNull - @Override - public Name getPackageName(@NotNull NamespaceDescriptor namespaceDescriptor) { - return namespaceDescriptor.getName(); - } - }; + private static final String CLASS_METADATA_FILE_EXTENSION = "kotlin_class"; + private static final String PACKAGE_FILE_NAME = ".kotlin_package"; + private static final String NAME_TABLE_FILE_NAME = ".kotlin_name_table"; + private static final String CLASS_NAMES_FILE_NAME = ".kotlin_class_names"; + private static final String CLASS_OBJECT_NAME = "object"; private BuiltInsSerializationUtil() { } + @NotNull + public static String relativeClassNameToFilePath(@NotNull FqNameUnsafe className) { + List correctedSegments = new ArrayList(); + for (Name segment : className.pathSegments()) { + if (segment.asString().startsWith(""), JavaBridgeConfiguration.ALL_JAVA_IMPORTS, JavaToKotlinClassMap.getInstance()); @@ -253,7 +228,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith serializeClasses(classes, serializedClasses); - DescriptorSerializer descriptorSerializer = new DescriptorSerializer(JAVA_NAMER); + DescriptorSerializer descriptorSerializer = new DescriptorSerializer(); List messages = Lists.newArrayList(); for (CallableMemberDescriptor callable : callables) { messages.add(descriptorSerializer.callableProto(callable).build()); @@ -268,7 +243,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith private static void serializeClasses(Collection classes, Map serializedClasses) throws IOException { for (ClassDescriptor classDescriptor : classes) { - DescriptorSerializer descriptorSerializer = new DescriptorSerializer(JAVA_NAMER); + DescriptorSerializer descriptorSerializer = new DescriptorSerializer(); ByteArrayOutputStream bytes = new ByteArrayOutputStream(); ProtoBuf.Class classProto = descriptorSerializer.classProto(classDescriptor).build(); @@ -355,12 +330,6 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith public ClassDescriptor resolveNestedClass(@NotNull ClassDescriptor outerClass, @NotNull Name name) { return findClass(classId.createNestedClassId(name)); } - - @Nullable - @Override - public ClassDescriptor resolveClassObject(@NotNull ClassDescriptor outerClass) { - return findClass(classId.createNestedClassId(Name.identifier(JvmAbi.CLASS_OBJECT_CLASS_NAME))); - } }; NameResolver nameResolver = new NameResolver(classMetadata.simpleNames, classMetadata.qualifiedNames); diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java index 8bdf0f6d246..d79891ab198 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java @@ -32,9 +32,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.lang.types.lang.BuiltInsSerializationUtil; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRendererBuilder; @@ -71,7 +69,7 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment { } private static NamespaceDescriptorImpl getDeserializedDescriptorsAsNamespace(Collection allDescriptors) { - DescriptorSerializer serializer = new DescriptorSerializer(BuiltInsSerializationUtil.BUILTINS_NAMER); + DescriptorSerializer serializer = new DescriptorSerializer(); final Map classProtos = serializeClasses(serializer, allDescriptors); @@ -97,12 +95,6 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment { return BuiltinsDeserializationTest.getClassId(classDescriptor); } - @NotNull - @Override - protected Name getClassObjectName(@NotNull ClassDescriptor outerClass) { - return BuiltInsSerializationUtil.CLASS_OBJECT_NAME; - } - @Nullable @Override protected ClassData getClassData(@NotNull ClassId classId) { @@ -196,6 +188,6 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment { } private static ClassId getClassId(ClassDescriptor classDescriptor) { - return ClassSerializationUtil.getClassId(classDescriptor, BuiltInsSerializationUtil.BUILTINS_NAMER); + return ClassSerializationUtil.getClassId(classDescriptor); } } diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java index cd8538f8ebe..24da907ca4d 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java @@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager; 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.io.IOException; @@ -91,13 +90,7 @@ public class WriteSerializedInfoTest extends CodegenTestCase { @NotNull @Override protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) { - return ClassSerializationUtil.getClassId(classDescriptor, DescriptorNamer.DEFAULT); - } - - @NotNull - @Override - protected Name getClassObjectName(@NotNull ClassDescriptor outerClass) { - return Name.special(""); + return ClassSerializationUtil.getClassId(classDescriptor); } @Override diff --git a/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java b/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java index f8efbda2a8f..952e76e1c47 100644 --- a/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java +++ b/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java @@ -9,13 +9,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.descriptors.serialization.*; +import org.jetbrains.jet.descriptors.serialization.ClassSerializationUtil; +import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer; +import org.jetbrains.jet.descriptors.serialization.NameSerializationUtil; +import org.jetbrains.jet.descriptors.serialization.ProtoBuf; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.lang.BuiltInsSerializationUtil; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.test.util.DescriptorValidator; @@ -29,11 +30,14 @@ import java.util.regex.Pattern; public class BuiltInsSerializer { private static final String BUILT_INS_SRC_DIR = "idea/builtinsSrc"; - private static final String DEST_DIR = "compiler/frontend/" + BuiltInsSerializationUtil.BUILT_INS_DIR; + private static final String DEST_DIR = "compiler/frontend/builtins"; private static int totalSize = 0; private static int totalFiles = 0; + private BuiltInsSerializer() { + } + public static void main(String[] args) throws IOException { List sourceFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.jet"), new File(BUILT_INS_SRC_DIR)); Disposable rootDisposable = Disposer.newDisposable(); @@ -43,9 +47,8 @@ public class BuiltInsSerializer { ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(files, environment, false); - FqName fqName = FqName.topLevel(Name.identifier(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING)); - NamespaceDescriptor namespace = module.getNamespace(fqName); - assert namespace != null : "No built-ins namespace: " + fqName; + NamespaceDescriptor namespace = module.getNamespace(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME); + assert namespace != null : "No built-ins namespace: " + KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; DescriptorValidator.validate(namespace); @@ -59,7 +62,7 @@ public class BuiltInsSerializer { System.err.println("Could not make directories: " + destDir); } - final DescriptorSerializer serializer = new DescriptorSerializer(BuiltInsSerializationUtil.BUILTINS_NAMER, new Predicate() { + final DescriptorSerializer serializer = new DescriptorSerializer(new Predicate() { private final ImmutableSet set = ImmutableSet.of("Any", "Nothing"); @Override