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 8176b7eaaaa..403d64543c4 100644 Binary files a/compiler/frontend/builtins/jet/.kotlin_class_names and b/compiler/frontend/builtins/jet/.kotlin_class_names differ diff --git a/compiler/frontend/builtins/jet/.kotlin_name_table b/compiler/frontend/builtins/jet/.kotlin_name_table index 0aed0856494..964f216fcde 100644 Binary files a/compiler/frontend/builtins/jet/.kotlin_name_table and b/compiler/frontend/builtins/jet/.kotlin_name_table differ diff --git a/compiler/frontend/builtins/jet/.kotlin_package b/compiler/frontend/builtins/jet/.kotlin_package index 6208de7aa57..8c736d5d0e4 100644 Binary files a/compiler/frontend/builtins/jet/.kotlin_package and b/compiler/frontend/builtins/jet/.kotlin_package differ 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 43384cc46b3..39b481e385d 100644 Binary files a/compiler/frontend/builtins/jet/CharArray.kotlin_class and b/compiler/frontend/builtins/jet/CharArray.kotlin_class differ 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 b7fad7578e0..2a8d3e3e540 100644 Binary files a/compiler/frontend/builtins/jet/CharProgression.kotlin_class and b/compiler/frontend/builtins/jet/CharProgression.kotlin_class differ 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 188c35d03e5..4186c13c878 100644 Binary files a/compiler/frontend/builtins/jet/CharSequence.kotlin_class and b/compiler/frontend/builtins/jet/CharSequence.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Collection.kotlin_class b/compiler/frontend/builtins/jet/Collection.kotlin_class index c641eb48a28..6bbb098a3fc 100644 Binary files a/compiler/frontend/builtins/jet/Collection.kotlin_class and b/compiler/frontend/builtins/jet/Collection.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/DoubleArray.kotlin_class b/compiler/frontend/builtins/jet/DoubleArray.kotlin_class index b96d67810a1..a67fe299bf4 100644 Binary files a/compiler/frontend/builtins/jet/DoubleArray.kotlin_class and b/compiler/frontend/builtins/jet/DoubleArray.kotlin_class differ 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 ab17a7197b0..17b77e93e78 100644 Binary files a/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class and b/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class differ 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 06bd242616a..918242a4bcb 100644 Binary files a/compiler/frontend/builtins/jet/Enum.kotlin_class and b/compiler/frontend/builtins/jet/Enum.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class index 23ed2dabc97..e975eb46a2c 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction0.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction1.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction1.kotlin_class index 715c7c720b1..b2c123f8862 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction1.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction1.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction10.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction10.kotlin_class index c8306db7d62..b5b3fa9fec2 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction10.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction10.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction11.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction11.kotlin_class index d22c39a5203..a733cc52623 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction11.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction11.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class index 85fc9a17f64..d2c573b1e18 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction12.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction13.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction13.kotlin_class index 2fae354ae79..3f5dc9d700e 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction13.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction13.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class index cfc8afd410b..63323c43099 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction14.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction15.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction15.kotlin_class index 1093ab7583a..7a95ed8daa0 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction15.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction15.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction16.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction16.kotlin_class index a2a63bcf67f..83edf81f169 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction16.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction16.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class index 2a7d74f1efd..2bb8425845e 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction17.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction18.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction18.kotlin_class index da6e0e0e6f0..238bc2153cc 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction18.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction18.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class index c2285e8e1fb..9b0864a8a25 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction19.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction2.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction2.kotlin_class index 95a157c5a00..9038cb491d1 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction2.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction2.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction20.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction20.kotlin_class index 3e34cd3cd1f..158d8a14cfd 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction20.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction20.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction21.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction21.kotlin_class index c1b730d0b24..176efaa6dfd 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction21.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction21.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class index 309f2bf02b1..3b05f4824ec 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction22.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class index 338bab207b3..63d81610d43 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction3.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction4.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction4.kotlin_class index 85639e34490..8c4752fb9e7 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction4.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction4.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction5.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction5.kotlin_class index e566b1b2af0..63d2d0e8f41 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction5.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction5.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction6.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction6.kotlin_class index 8a8f9d90778..aea1af60526 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction6.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction6.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction7.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction7.kotlin_class index 9a26f22cca5..a5597191ab8 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction7.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction7.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction8.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction8.kotlin_class index 14535f21fce..3cfae0e5acc 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction8.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction8.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class b/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class index 4af760ccc75..920fb4a8e1a 100644 Binary files a/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class and b/compiler/frontend/builtins/jet/ExtensionFunction9.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/FloatArray.kotlin_class b/compiler/frontend/builtins/jet/FloatArray.kotlin_class index 7649b7fbd38..3a71c733460 100644 Binary files a/compiler/frontend/builtins/jet/FloatArray.kotlin_class and b/compiler/frontend/builtins/jet/FloatArray.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/FloatIterator.kotlin_class b/compiler/frontend/builtins/jet/FloatIterator.kotlin_class index 3e2ff391a65..11ed4daf347 100644 --- a/compiler/frontend/builtins/jet/FloatIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/FloatIterator.kotlin_class @@ -1,7 +1,7 @@ -& ¬2 +& «2  R Æ0B -Z 0B -Z &0­B +Z &0¬B  \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/FloatProgression.kotlin_class b/compiler/frontend/builtins/jet/FloatProgression.kotlin_class index a5aaf5e3c5f..12d56179184 100644 Binary files a/compiler/frontend/builtins/jet/FloatProgression.kotlin_class and b/compiler/frontend/builtins/jet/FloatProgression.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class b/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class index 0c5cdaff549..0bd839ff6c6 100644 --- a/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class @@ -1,4 +1,4 @@ -† ¯2 +† ®2 R Â0B -/Z Æ0JB +/Z Æ0IB  \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Function0.kotlin_class b/compiler/frontend/builtins/jet/Function0.kotlin_class index 1cc2a299e58..6aaae76ce5f 100644 Binary files a/compiler/frontend/builtins/jet/Function0.kotlin_class and b/compiler/frontend/builtins/jet/Function0.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function1.kotlin_class b/compiler/frontend/builtins/jet/Function1.kotlin_class index fc1c509d7bd..41067912ac2 100644 Binary files a/compiler/frontend/builtins/jet/Function1.kotlin_class and b/compiler/frontend/builtins/jet/Function1.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function10.kotlin_class b/compiler/frontend/builtins/jet/Function10.kotlin_class index f06dac318d8..5b6baa04f3a 100644 Binary files a/compiler/frontend/builtins/jet/Function10.kotlin_class and b/compiler/frontend/builtins/jet/Function10.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function11.kotlin_class b/compiler/frontend/builtins/jet/Function11.kotlin_class index 6ea0a045fdb..145a5cec29a 100644 Binary files a/compiler/frontend/builtins/jet/Function11.kotlin_class and b/compiler/frontend/builtins/jet/Function11.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function12.kotlin_class b/compiler/frontend/builtins/jet/Function12.kotlin_class index 48af1e0fe75..29276f6b797 100644 Binary files a/compiler/frontend/builtins/jet/Function12.kotlin_class and b/compiler/frontend/builtins/jet/Function12.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function13.kotlin_class b/compiler/frontend/builtins/jet/Function13.kotlin_class index 837cd0c8abd..fcbd3cf6471 100644 Binary files a/compiler/frontend/builtins/jet/Function13.kotlin_class and b/compiler/frontend/builtins/jet/Function13.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function14.kotlin_class b/compiler/frontend/builtins/jet/Function14.kotlin_class index 2479cdcd22e..5a5f192e160 100644 Binary files a/compiler/frontend/builtins/jet/Function14.kotlin_class and b/compiler/frontend/builtins/jet/Function14.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function15.kotlin_class b/compiler/frontend/builtins/jet/Function15.kotlin_class index b1aa12b32f1..3d192712111 100644 Binary files a/compiler/frontend/builtins/jet/Function15.kotlin_class and b/compiler/frontend/builtins/jet/Function15.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function16.kotlin_class b/compiler/frontend/builtins/jet/Function16.kotlin_class index 1d28919580b..e6954406199 100644 Binary files a/compiler/frontend/builtins/jet/Function16.kotlin_class and b/compiler/frontend/builtins/jet/Function16.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function17.kotlin_class b/compiler/frontend/builtins/jet/Function17.kotlin_class index f3192b44ae1..254c89761df 100644 Binary files a/compiler/frontend/builtins/jet/Function17.kotlin_class and b/compiler/frontend/builtins/jet/Function17.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function18.kotlin_class b/compiler/frontend/builtins/jet/Function18.kotlin_class index e2f289fa238..7652b7570f7 100644 Binary files a/compiler/frontend/builtins/jet/Function18.kotlin_class and b/compiler/frontend/builtins/jet/Function18.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function19.kotlin_class b/compiler/frontend/builtins/jet/Function19.kotlin_class index e087605b992..6c14de8d0dc 100644 Binary files a/compiler/frontend/builtins/jet/Function19.kotlin_class and b/compiler/frontend/builtins/jet/Function19.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function2.kotlin_class b/compiler/frontend/builtins/jet/Function2.kotlin_class index e6c78dece17..4ac0e9f2597 100644 Binary files a/compiler/frontend/builtins/jet/Function2.kotlin_class and b/compiler/frontend/builtins/jet/Function2.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function20.kotlin_class b/compiler/frontend/builtins/jet/Function20.kotlin_class index 56108ef909c..ed908488698 100644 Binary files a/compiler/frontend/builtins/jet/Function20.kotlin_class and b/compiler/frontend/builtins/jet/Function20.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function21.kotlin_class b/compiler/frontend/builtins/jet/Function21.kotlin_class index 0dfd8d5d57e..421499ac99d 100644 Binary files a/compiler/frontend/builtins/jet/Function21.kotlin_class and b/compiler/frontend/builtins/jet/Function21.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function22.kotlin_class b/compiler/frontend/builtins/jet/Function22.kotlin_class index e8037f9d188..e6a9574a47b 100644 Binary files a/compiler/frontend/builtins/jet/Function22.kotlin_class and b/compiler/frontend/builtins/jet/Function22.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function3.kotlin_class b/compiler/frontend/builtins/jet/Function3.kotlin_class index fd1e71d2c8b..70a8fc41694 100644 Binary files a/compiler/frontend/builtins/jet/Function3.kotlin_class and b/compiler/frontend/builtins/jet/Function3.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function4.kotlin_class b/compiler/frontend/builtins/jet/Function4.kotlin_class index 96acd462c99..785ebc0ae96 100644 Binary files a/compiler/frontend/builtins/jet/Function4.kotlin_class and b/compiler/frontend/builtins/jet/Function4.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function5.kotlin_class b/compiler/frontend/builtins/jet/Function5.kotlin_class index fc8c16aee21..18505d194e8 100644 Binary files a/compiler/frontend/builtins/jet/Function5.kotlin_class and b/compiler/frontend/builtins/jet/Function5.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function6.kotlin_class b/compiler/frontend/builtins/jet/Function6.kotlin_class index 05853d62612..64877056548 100644 Binary files a/compiler/frontend/builtins/jet/Function6.kotlin_class and b/compiler/frontend/builtins/jet/Function6.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function7.kotlin_class b/compiler/frontend/builtins/jet/Function7.kotlin_class index 58348b7013a..d49addd94f9 100644 Binary files a/compiler/frontend/builtins/jet/Function7.kotlin_class and b/compiler/frontend/builtins/jet/Function7.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function8.kotlin_class b/compiler/frontend/builtins/jet/Function8.kotlin_class index 40c39a2539e..6fd6d939693 100644 Binary files a/compiler/frontend/builtins/jet/Function8.kotlin_class and b/compiler/frontend/builtins/jet/Function8.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Function9.kotlin_class b/compiler/frontend/builtins/jet/Function9.kotlin_class index 4a4a4abdc68..0544ff80e6d 100644 Binary files a/compiler/frontend/builtins/jet/Function9.kotlin_class and b/compiler/frontend/builtins/jet/Function9.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Hashable.kotlin_class b/compiler/frontend/builtins/jet/Hashable.kotlin_class index 4263a02976d..ad9dca5afb0 100644 Binary files a/compiler/frontend/builtins/jet/Hashable.kotlin_class and b/compiler/frontend/builtins/jet/Hashable.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Int.kotlin_class b/compiler/frontend/builtins/jet/Int.kotlin_class index ed3aa5b71c5..4809891b4a3 100644 Binary files a/compiler/frontend/builtins/jet/Int.kotlin_class and b/compiler/frontend/builtins/jet/Int.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/IntArray.kotlin_class b/compiler/frontend/builtins/jet/IntArray.kotlin_class index 788a47e3739..f1d6018a1aa 100644 Binary files a/compiler/frontend/builtins/jet/IntArray.kotlin_class and b/compiler/frontend/builtins/jet/IntArray.kotlin_class differ 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 77972400a21..02d9b7719e1 100644 Binary files a/compiler/frontend/builtins/jet/IntProgression.kotlin_class and b/compiler/frontend/builtins/jet/IntProgression.kotlin_class differ 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 85452e4ae47..c949e8791bb 100644 Binary files a/compiler/frontend/builtins/jet/Iterable.kotlin_class and b/compiler/frontend/builtins/jet/Iterable.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Iterator.kotlin_class b/compiler/frontend/builtins/jet/Iterator.kotlin_class index a7cd1c9c2f1..cfe74350eab 100644 Binary files a/compiler/frontend/builtins/jet/Iterator.kotlin_class and b/compiler/frontend/builtins/jet/Iterator.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class index 02a795b6ca0..06021dff700 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction0.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class index 7feb52f7905..5e00cdcf818 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction1.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class index 84d15ad4312..6f83f4899a5 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction10.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class index 7f03aff5eb7..58d293e3ac2 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction11.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction12.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction12.kotlin_class index 44c4e7ba35d..163e2d1237e 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction12.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction12.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class index 6d9b2964213..46d78677676 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction13.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class index b7530952c07..9fc9cdde461 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction14.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction15.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction15.kotlin_class index de47f10ad98..f707d242086 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction15.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction15.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class index e9784a08a46..601807accad 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction16.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class index 28e7af74926..f074d14351a 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction17.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class index c38a6817dde..484df7e64db 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction18.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction19.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction19.kotlin_class index d6e4da792a8..7b6ecd707c7 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction19.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction19.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction2.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction2.kotlin_class index 4ddf411e596..39af92e571b 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction2.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction2.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction20.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction20.kotlin_class index 0b444a51608..f656057a993 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction20.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction20.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class index 2813af53a6b..cca688f4843 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction21.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class index 18cdd4b8f65..157077149b1 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction22.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction3.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction3.kotlin_class index 44996447b09..745b801f69e 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction3.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction3.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction4.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction4.kotlin_class index b7a2793edbb..c1ff5b55f55 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction4.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction4.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction5.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction5.kotlin_class index e0b3a07485b..84b3131d34b 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction5.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction5.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class index 4037b98dd7a..0d6ca995c3e 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction6.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class index 8465ec89a3a..460597cdec8 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction7.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class index 591ac1a82b9..f3080ca1b2e 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction8.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class b/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class index c9d75de90e5..978b21df5c5 100644 Binary files a/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class and b/compiler/frontend/builtins/jet/KExtensionFunction9.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction0.kotlin_class b/compiler/frontend/builtins/jet/KFunction0.kotlin_class index f61d27766b0..e0dd98646fa 100644 Binary files a/compiler/frontend/builtins/jet/KFunction0.kotlin_class and b/compiler/frontend/builtins/jet/KFunction0.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction1.kotlin_class b/compiler/frontend/builtins/jet/KFunction1.kotlin_class index 0a969bf3e29..da5c15c6497 100644 Binary files a/compiler/frontend/builtins/jet/KFunction1.kotlin_class and b/compiler/frontend/builtins/jet/KFunction1.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction10.kotlin_class b/compiler/frontend/builtins/jet/KFunction10.kotlin_class index 86e18049fa1..1ba21e1dfa5 100644 Binary files a/compiler/frontend/builtins/jet/KFunction10.kotlin_class and b/compiler/frontend/builtins/jet/KFunction10.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction11.kotlin_class b/compiler/frontend/builtins/jet/KFunction11.kotlin_class index 3f7daf9d401..bdcfee8da4d 100644 Binary files a/compiler/frontend/builtins/jet/KFunction11.kotlin_class and b/compiler/frontend/builtins/jet/KFunction11.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction12.kotlin_class b/compiler/frontend/builtins/jet/KFunction12.kotlin_class index b34a42194c1..b86e095d608 100644 Binary files a/compiler/frontend/builtins/jet/KFunction12.kotlin_class and b/compiler/frontend/builtins/jet/KFunction12.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction13.kotlin_class b/compiler/frontend/builtins/jet/KFunction13.kotlin_class index 6d0ca398bbc..33c6b7e7972 100644 Binary files a/compiler/frontend/builtins/jet/KFunction13.kotlin_class and b/compiler/frontend/builtins/jet/KFunction13.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction14.kotlin_class b/compiler/frontend/builtins/jet/KFunction14.kotlin_class index 3ea1db4c3d0..918402ee5f0 100644 Binary files a/compiler/frontend/builtins/jet/KFunction14.kotlin_class and b/compiler/frontend/builtins/jet/KFunction14.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction15.kotlin_class b/compiler/frontend/builtins/jet/KFunction15.kotlin_class index 78d60d6479f..9121e41ca77 100644 Binary files a/compiler/frontend/builtins/jet/KFunction15.kotlin_class and b/compiler/frontend/builtins/jet/KFunction15.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction16.kotlin_class b/compiler/frontend/builtins/jet/KFunction16.kotlin_class index c58c30e4aee..56edeed157a 100644 Binary files a/compiler/frontend/builtins/jet/KFunction16.kotlin_class and b/compiler/frontend/builtins/jet/KFunction16.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction17.kotlin_class b/compiler/frontend/builtins/jet/KFunction17.kotlin_class index 71057118ac8..88ce7867c6a 100644 Binary files a/compiler/frontend/builtins/jet/KFunction17.kotlin_class and b/compiler/frontend/builtins/jet/KFunction17.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction18.kotlin_class b/compiler/frontend/builtins/jet/KFunction18.kotlin_class index 493ecfd90d7..27241db1188 100644 Binary files a/compiler/frontend/builtins/jet/KFunction18.kotlin_class and b/compiler/frontend/builtins/jet/KFunction18.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction19.kotlin_class b/compiler/frontend/builtins/jet/KFunction19.kotlin_class index 1f729e44f5a..29066c09c72 100644 Binary files a/compiler/frontend/builtins/jet/KFunction19.kotlin_class and b/compiler/frontend/builtins/jet/KFunction19.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction2.kotlin_class b/compiler/frontend/builtins/jet/KFunction2.kotlin_class index 740778f34f8..c40ff3a9501 100644 Binary files a/compiler/frontend/builtins/jet/KFunction2.kotlin_class and b/compiler/frontend/builtins/jet/KFunction2.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction20.kotlin_class b/compiler/frontend/builtins/jet/KFunction20.kotlin_class index d8a8be39272..3e14401b280 100644 Binary files a/compiler/frontend/builtins/jet/KFunction20.kotlin_class and b/compiler/frontend/builtins/jet/KFunction20.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction21.kotlin_class b/compiler/frontend/builtins/jet/KFunction21.kotlin_class index 41a75275256..d642dda58f6 100644 Binary files a/compiler/frontend/builtins/jet/KFunction21.kotlin_class and b/compiler/frontend/builtins/jet/KFunction21.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction22.kotlin_class b/compiler/frontend/builtins/jet/KFunction22.kotlin_class index 9536603e663..bf143ff9f1e 100644 Binary files a/compiler/frontend/builtins/jet/KFunction22.kotlin_class and b/compiler/frontend/builtins/jet/KFunction22.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction3.kotlin_class b/compiler/frontend/builtins/jet/KFunction3.kotlin_class index e5b587cd1d7..a803022aedc 100644 Binary files a/compiler/frontend/builtins/jet/KFunction3.kotlin_class and b/compiler/frontend/builtins/jet/KFunction3.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction4.kotlin_class b/compiler/frontend/builtins/jet/KFunction4.kotlin_class index 0e614ee09b7..c7a864e6aa0 100644 Binary files a/compiler/frontend/builtins/jet/KFunction4.kotlin_class and b/compiler/frontend/builtins/jet/KFunction4.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction5.kotlin_class b/compiler/frontend/builtins/jet/KFunction5.kotlin_class index 0fd9a8d2496..8c23af6ff09 100644 Binary files a/compiler/frontend/builtins/jet/KFunction5.kotlin_class and b/compiler/frontend/builtins/jet/KFunction5.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction6.kotlin_class b/compiler/frontend/builtins/jet/KFunction6.kotlin_class index b105b430b5a..ca58705e099 100644 Binary files a/compiler/frontend/builtins/jet/KFunction6.kotlin_class and b/compiler/frontend/builtins/jet/KFunction6.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction7.kotlin_class b/compiler/frontend/builtins/jet/KFunction7.kotlin_class index 2f1af846093..a15a620d642 100644 Binary files a/compiler/frontend/builtins/jet/KFunction7.kotlin_class and b/compiler/frontend/builtins/jet/KFunction7.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction8.kotlin_class b/compiler/frontend/builtins/jet/KFunction8.kotlin_class index e0a91e393cc..96686639ecf 100644 Binary files a/compiler/frontend/builtins/jet/KFunction8.kotlin_class and b/compiler/frontend/builtins/jet/KFunction8.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KFunction9.kotlin_class b/compiler/frontend/builtins/jet/KFunction9.kotlin_class index 423b5f1c8a8..91a967deef1 100644 Binary files a/compiler/frontend/builtins/jet/KFunction9.kotlin_class and b/compiler/frontend/builtins/jet/KFunction9.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class index 98ae9b42c02..1883836b5f3 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction0.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class index 533036eae55..cf778901048 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction1.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class index 3f59b8289e6..6821466ba18 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction10.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class index 817981db4c6..495cbe71148 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction11.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class index 87fe1dcea5f..6c7b68ec377 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction12.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class index 41e48b7d880..ff1fbe5af40 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction13.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class index 49bf7328545..e981e886f14 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction14.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class index ea4c21efe8a..54c52488e17 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction15.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class index ffe8e26233c..a0a3547fad7 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction16.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class index 8f2e9a3dce7..f50a2473a97 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction17.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class index 8d0504aed7a..3923d37f7da 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction18.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class index 76fe1a1a456..e307f1ca0e3 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction19.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class index 8af1f47e565..9e823e3dd45 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction2.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class index 2ed4a2ed8b1..49ec33e2654 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction20.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class index cc88cf50848..349080659ad 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction21.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction22.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction22.kotlin_class index 4d06b203f7a..7699f86817e 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction22.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction22.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class index 63edaccd540..1685ae09e5f 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction3.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class index 3f1ac32694b..fb219775d1e 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction4.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class index 28681f3e7c1..7affa46fa9d 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction5.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction6.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction6.kotlin_class index 5d33d3fbf26..81b29ad9303 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction6.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction6.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class index 46600f7e68d..5de9342532c 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction7.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class index ad9e712f6b4..30c377bed0b 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction8.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class b/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class index ef7730b317a..62a93e08460 100644 Binary files a/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class and b/compiler/frontend/builtins/jet/KMemberFunction9.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/List.kotlin_class b/compiler/frontend/builtins/jet/List.kotlin_class index 2b7b5872d70..f49fc5aff48 100644 Binary files a/compiler/frontend/builtins/jet/List.kotlin_class and b/compiler/frontend/builtins/jet/List.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ListIterator.kotlin_class b/compiler/frontend/builtins/jet/ListIterator.kotlin_class index 0f6cf2227be..01abc38002a 100644 Binary files a/compiler/frontend/builtins/jet/ListIterator.kotlin_class and b/compiler/frontend/builtins/jet/ListIterator.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Long.kotlin_class b/compiler/frontend/builtins/jet/Long.kotlin_class index b0f86204099..2ad7fe043c5 100644 Binary files a/compiler/frontend/builtins/jet/Long.kotlin_class and b/compiler/frontend/builtins/jet/Long.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/LongArray.kotlin_class b/compiler/frontend/builtins/jet/LongArray.kotlin_class index 1a08d9d0799..4ddc7e141ed 100644 Binary files a/compiler/frontend/builtins/jet/LongArray.kotlin_class and b/compiler/frontend/builtins/jet/LongArray.kotlin_class differ 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 0d70037d352..caa9ff3a857 100644 Binary files a/compiler/frontend/builtins/jet/LongProgression.kotlin_class and b/compiler/frontend/builtins/jet/LongProgression.kotlin_class differ 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 fb73fb93078..1bd74cbc94b 100644 Binary files a/compiler/frontend/builtins/jet/Map.Entry.kotlin_class and b/compiler/frontend/builtins/jet/Map.Entry.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Map.kotlin_class b/compiler/frontend/builtins/jet/Map.kotlin_class index 77989d89dac..2b3383bd406 100644 Binary files a/compiler/frontend/builtins/jet/Map.kotlin_class and b/compiler/frontend/builtins/jet/Map.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableCollection.kotlin_class b/compiler/frontend/builtins/jet/MutableCollection.kotlin_class index c923f5250e5..778161563a0 100644 Binary files a/compiler/frontend/builtins/jet/MutableCollection.kotlin_class and b/compiler/frontend/builtins/jet/MutableCollection.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableIterable.kotlin_class b/compiler/frontend/builtins/jet/MutableIterable.kotlin_class index 2b57c2e1194..2a20acdd159 100644 Binary files a/compiler/frontend/builtins/jet/MutableIterable.kotlin_class and b/compiler/frontend/builtins/jet/MutableIterable.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableIterator.kotlin_class b/compiler/frontend/builtins/jet/MutableIterator.kotlin_class index e15f9656126..31e207fadad 100644 Binary files a/compiler/frontend/builtins/jet/MutableIterator.kotlin_class and b/compiler/frontend/builtins/jet/MutableIterator.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableList.kotlin_class b/compiler/frontend/builtins/jet/MutableList.kotlin_class index 97d9cf1c566..53ca0b3f047 100644 Binary files a/compiler/frontend/builtins/jet/MutableList.kotlin_class and b/compiler/frontend/builtins/jet/MutableList.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class b/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class index fd82b564686..91a56c46892 100644 Binary files a/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class and b/compiler/frontend/builtins/jet/MutableListIterator.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class index df74a5f8d04..94b3bd3c8bb 100644 Binary files a/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class and b/compiler/frontend/builtins/jet/MutableMap.MutableEntry.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableMap.kotlin_class b/compiler/frontend/builtins/jet/MutableMap.kotlin_class index 26913052a20..7a4600f828a 100644 Binary files a/compiler/frontend/builtins/jet/MutableMap.kotlin_class and b/compiler/frontend/builtins/jet/MutableMap.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/MutableSet.kotlin_class b/compiler/frontend/builtins/jet/MutableSet.kotlin_class index 78cccc8e2b8..308cce989ad 100644 Binary files a/compiler/frontend/builtins/jet/MutableSet.kotlin_class and b/compiler/frontend/builtins/jet/MutableSet.kotlin_class differ 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 ca6bd5d7278..1b5329373ab 100644 Binary files a/compiler/frontend/builtins/jet/Progression.kotlin_class and b/compiler/frontend/builtins/jet/Progression.kotlin_class differ 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 9c2b060a59f..27ec7e0024f 100644 Binary files a/compiler/frontend/builtins/jet/PropertyMetadataImpl.kotlin_class and b/compiler/frontend/builtins/jet/PropertyMetadataImpl.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Set.kotlin_class b/compiler/frontend/builtins/jet/Set.kotlin_class index 0be90038f8e..80c1cfe4012 100644 Binary files a/compiler/frontend/builtins/jet/Set.kotlin_class and b/compiler/frontend/builtins/jet/Set.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ShortArray.kotlin_class b/compiler/frontend/builtins/jet/ShortArray.kotlin_class index 87ac873d20c..a7c5cd23081 100644 Binary files a/compiler/frontend/builtins/jet/ShortArray.kotlin_class and b/compiler/frontend/builtins/jet/ShortArray.kotlin_class differ 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 255372cce91..1b206b8e955 100644 Binary files a/compiler/frontend/builtins/jet/ShortProgression.kotlin_class and b/compiler/frontend/builtins/jet/ShortProgression.kotlin_class differ 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 dcb65015e6b..7fd163631aa 100644 Binary files a/compiler/frontend/builtins/jet/String.kotlin_class and b/compiler/frontend/builtins/jet/String.kotlin_class differ 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 1e0ea4bf81a..effcb6ef110 100644 Binary files a/compiler/frontend/builtins/jet/deprecated.kotlin_class and b/compiler/frontend/builtins/jet/deprecated.kotlin_class differ 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