diff --git a/compiler/frontend/builtins/jet/.kotlin_class_names b/compiler/frontend/builtins/jet/.kotlin_class_names index 217d719bc65..4e0ee3cfd0b 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 4e391c72de6..04184dd7125 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 1780444e4bd..018f9e4dab2 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/Annotation.kotlin_class b/compiler/frontend/builtins/jet/Annotation.kotlin_class index 4711375fb16..d400db8e670 100644 Binary files a/compiler/frontend/builtins/jet/Annotation.kotlin_class and b/compiler/frontend/builtins/jet/Annotation.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Any.kotlin_class b/compiler/frontend/builtins/jet/Any.kotlin_class index 26522767ab1..ef6c918b55f 100644 --- a/compiler/frontend/builtins/jet/Any.kotlin_class +++ b/compiler/frontend/builtins/jet/Any.kotlin_class @@ -1,2 +1,2 @@ - R Æ0B - \ No newline at end of file +R Æ0B + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Array.kotlin_class b/compiler/frontend/builtins/jet/Array.kotlin_class index 647cceb3adf..67f0538a5c7 100644 Binary files a/compiler/frontend/builtins/jet/Array.kotlin_class and b/compiler/frontend/builtins/jet/Array.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Boolean.kotlin_class b/compiler/frontend/builtins/jet/Boolean.kotlin_class index 880254f0f23..8b472b4bbd5 100644 Binary files a/compiler/frontend/builtins/jet/Boolean.kotlin_class and b/compiler/frontend/builtins/jet/Boolean.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/BooleanArray.kotlin_class b/compiler/frontend/builtins/jet/BooleanArray.kotlin_class index 7771e754816..59a95a485a3 100644 Binary files a/compiler/frontend/builtins/jet/BooleanArray.kotlin_class and b/compiler/frontend/builtins/jet/BooleanArray.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/BooleanIterator.kotlin_class b/compiler/frontend/builtins/jet/BooleanIterator.kotlin_class index 552a165c1bb..cd5af886994 100644 --- a/compiler/frontend/builtins/jet/BooleanIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/BooleanIterator.kotlin_class @@ -1,9 +1,8 @@ -& 2 - -R Æ0B - -Z +& 2 + + R Æ0B + Z 0B -Z + Z &0B - \ No newline at end of file + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Byte.kotlin_class b/compiler/frontend/builtins/jet/Byte.kotlin_class index b29bcd29178..b9b56a89c2b 100644 Binary files a/compiler/frontend/builtins/jet/Byte.kotlin_class and b/compiler/frontend/builtins/jet/Byte.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ByteArray.kotlin_class b/compiler/frontend/builtins/jet/ByteArray.kotlin_class index 6de58db1613..a649c48a69a 100644 Binary files a/compiler/frontend/builtins/jet/ByteArray.kotlin_class and b/compiler/frontend/builtins/jet/ByteArray.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ByteIterator.kotlin_class b/compiler/frontend/builtins/jet/ByteIterator.kotlin_class index 9e3325f06cf..cddee191648 100644 --- a/compiler/frontend/builtins/jet/ByteIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/ByteIterator.kotlin_class @@ -1,8 +1,8 @@ -& >2 - - R Æ0B -Z +&2 + + R Æ0B +Z 0B - Z + Z &0?B - \ No newline at end of file + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/ByteProgression.kotlin_class b/compiler/frontend/builtins/jet/ByteProgression.kotlin_class index 7dd8b10c409..7c90b10e667 100644 Binary files a/compiler/frontend/builtins/jet/ByteProgression.kotlin_class and b/compiler/frontend/builtins/jet/ByteProgression.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ByteRange.kotlin_class b/compiler/frontend/builtins/jet/ByteRange.kotlin_class index 7bb24090129..77d9ab60673 100644 Binary files a/compiler/frontend/builtins/jet/ByteRange.kotlin_class and b/compiler/frontend/builtins/jet/ByteRange.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class b/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class index 222f9338e89..234b12335aa 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 Æ 0IB - \ No newline at end of file +†2 +R Â0B +Z Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Char.kotlin_class b/compiler/frontend/builtins/jet/Char.kotlin_class index 3562a3794ad..d77e9cc4aa7 100644 Binary files a/compiler/frontend/builtins/jet/Char.kotlin_class and b/compiler/frontend/builtins/jet/Char.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/CharArray.kotlin_class b/compiler/frontend/builtins/jet/CharArray.kotlin_class index b5c7e1fe3a1..5697327d4b3 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 8bc59d0a30b..3ef3ea40e68 100644 --- a/compiler/frontend/builtins/jet/CharIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/CharIterator.kotlin_class @@ -1,8 +1,8 @@ -& K2 - -R Æ0B - Z +&!2 + +R Æ0B +!Z 0B -Z +Z &0LB - \ No newline at end of file + \ 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 8d6d7be7520..f46036e3c86 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.kotlin_class b/compiler/frontend/builtins/jet/CharRange.kotlin_class index cfc776a0da7..cf73b03419f 100644 Binary files a/compiler/frontend/builtins/jet/CharRange.kotlin_class and b/compiler/frontend/builtins/jet/CharRange.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class index 6fe17e41a23..412b9e2cb4c 100644 --- a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class @@ -1,4 +1,4 @@ -† N2 -R Â0B -"Z Æ 0IB - \ No newline at end of file +†#2 +R Â0B +#Z Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/CharSequence.kotlin_class b/compiler/frontend/builtins/jet/CharSequence.kotlin_class index 582048817fe..41321a1ac0c 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 6bbb098a3fc..61449d25967 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/Comparable.kotlin_class b/compiler/frontend/builtins/jet/Comparable.kotlin_class index 21e07123356..cd90405868a 100644 Binary files a/compiler/frontend/builtins/jet/Comparable.kotlin_class and b/compiler/frontend/builtins/jet/Comparable.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Double.kotlin_class b/compiler/frontend/builtins/jet/Double.kotlin_class index 53c076c5641..34f9c8fdb66 100644 Binary files a/compiler/frontend/builtins/jet/Double.kotlin_class and b/compiler/frontend/builtins/jet/Double.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/DoubleArray.kotlin_class b/compiler/frontend/builtins/jet/DoubleArray.kotlin_class index 37135c22766..1f3e7a4af6a 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 ca4166e7a82..3c5453521ca 100644 --- a/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/DoubleIterator.kotlin_class @@ -1,8 +1,8 @@ -& ^2 - -R Æ0B -(Z +&*2 + +R Æ0B +*Z 0B -Z +Z &0_B - \ No newline at end of file + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class b/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class index 923c15dad8c..1652bce93c9 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.kotlin_class b/compiler/frontend/builtins/jet/DoubleRange.kotlin_class index 54dfef94aea..e48ab9c0230 100644 Binary files a/compiler/frontend/builtins/jet/DoubleRange.kotlin_class and b/compiler/frontend/builtins/jet/DoubleRange.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class b/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class index 31d3aeed766..44f79c3165a 100644 --- a/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class @@ -1,4 +1,4 @@ -† a2 -R Â0B -*Z Æ 0IB - \ No newline at end of file +†,2 +R Â0B +,Z Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Enum.kotlin_class b/compiler/frontend/builtins/jet/Enum.kotlin_class index 918242a4bcb..ca5987153d0 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 e975eb46a2c..3dd41e97be1 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 b2c123f8862..7d0df048d62 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 b5b3fa9fec2..1a41836a377 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 a733cc52623..9825bc37af3 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 d2c573b1e18..10eb52fbf1e 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 3f5dc9d700e..210f73e6416 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 63323c43099..6c39d9202e5 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 7a95ed8daa0..8a55a246156 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 83edf81f169..1d225c63edf 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 2bb8425845e..d0f84dbaa62 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 238bc2153cc..34a966360d0 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 9b0864a8a25..bf66c1c6f6e 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 9038cb491d1..f8926004103 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 158d8a14cfd..161078d500b 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 176efaa6dfd..61552114a8a 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 3b05f4824ec..f6d1c9bf301 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 63d81610d43..57a324f09ad 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 8c4752fb9e7..c96ae2b5c6c 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 63d2d0e8f41..bf1242714f7 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 aea1af60526..6c12e08b75c 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 a5597191ab8..02f46bdc59a 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 3cfae0e5acc..1ebac978e7a 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 920fb4a8e1a..2d965e0538d 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/Float.kotlin_class b/compiler/frontend/builtins/jet/Float.kotlin_class index 45a60e9c4d7..8bfc8a34359 100644 Binary files a/compiler/frontend/builtins/jet/Float.kotlin_class and b/compiler/frontend/builtins/jet/Float.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/FloatArray.kotlin_class b/compiler/frontend/builtins/jet/FloatArray.kotlin_class index 41221e29c76..d914e488bb3 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 11ed4daf347..3d6366d30e2 100644 --- a/compiler/frontend/builtins/jet/FloatIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/FloatIterator.kotlin_class @@ -1,7 +1,7 @@ -& «2 - -R Æ0B --Z +&F2 + +R Æ0B +FZ 0B -Z &0¬B - \ No newline at end of file +Z &0¬B + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/FloatProgression.kotlin_class b/compiler/frontend/builtins/jet/FloatProgression.kotlin_class index c1990486a61..905c0f91faf 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.kotlin_class b/compiler/frontend/builtins/jet/FloatRange.kotlin_class index ea313686031..35c06e5e172 100644 Binary files a/compiler/frontend/builtins/jet/FloatRange.kotlin_class and b/compiler/frontend/builtins/jet/FloatRange.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class b/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class index bbc3ccecd98..f3db15ae1a1 100644 --- a/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class @@ -1,4 +1,4 @@ -† ®2 -R Â0B -/Z Æ 0IB - \ No newline at end of file +†H2 +R Â0B +HZ Æ 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 6aaae76ce5f..cbfc9434f79 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 41067912ac2..53de6d941c6 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 5b6baa04f3a..19a7dec2fb0 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 145a5cec29a..bc392a34e28 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 29276f6b797..683a39de233 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 fcbd3cf6471..a1fbca87545 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 5a5f192e160..059c93dbfc8 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 3d192712111..35122e6a08b 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 e6954406199..98e29ab70bf 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 254c89761df..99908e1f965 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 7652b7570f7..26ce4b3e572 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 6c14de8d0dc..50f6c6c2366 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 4ac0e9f2597..500d532cd4d 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 ed908488698..d238d5ac295 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 421499ac99d..239b7e0294b 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 e6a9574a47b..7fedb6b19d2 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 70a8fc41694..49488a1933c 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 785ebc0ae96..8eaba0980e4 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 18505d194e8..3858071f554 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 64877056548..8840d1e17d5 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 d49addd94f9..49329eeabbb 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 6fd6d939693..ac1c2512caf 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 0544ff80e6d..d712f394777 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 ad9dca5afb0..566c778ab17 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 4809891b4a3..9d5f6f2a3ce 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 3418b23de14..db0bda39dc8 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 31b70146234..03df0bc6d22 100644 --- a/compiler/frontend/builtins/jet/IntIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/IntIterator.kotlin_class @@ -1,7 +1,7 @@ -& Ë2 - -R Æ0B -1Z +&`2 + +R Æ0B +`Z 0B -Z &0ÌB - \ No newline at end of file +Z &0ÌB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/IntProgression.kotlin_class b/compiler/frontend/builtins/jet/IntProgression.kotlin_class index 197918f729b..11235ab9913 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.kotlin_class b/compiler/frontend/builtins/jet/IntRange.kotlin_class index b8388da00b0..977c4be30c7 100644 Binary files a/compiler/frontend/builtins/jet/IntRange.kotlin_class and b/compiler/frontend/builtins/jet/IntRange.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/IntRange.object.kotlin_class b/compiler/frontend/builtins/jet/IntRange.object.kotlin_class index 643cbc2d971..2d8347df9d0 100644 --- a/compiler/frontend/builtins/jet/IntRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/IntRange.object.kotlin_class @@ -1,4 +1,4 @@ -† Î2 -R Â0B -3Z Æ 0IB - \ No newline at end of file +†b2 +R Â0B +bZ Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Iterable.kotlin_class b/compiler/frontend/builtins/jet/Iterable.kotlin_class index c949e8791bb..909005b4d09 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 cfe74350eab..c0ccd61d645 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 06021dff700..d10e04650ce 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 5e00cdcf818..41bd22fdf63 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 6f83f4899a5..97536060e96 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 58d293e3ac2..0889e27cfdb 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 163e2d1237e..bd602fe025b 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 46d78677676..1e124d916e4 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 9fc9cdde461..38ccb5aa3d3 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 f707d242086..b85b433272c 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 601807accad..f4316415009 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 f074d14351a..16c51c9e18a 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 484df7e64db..4499c4da43d 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 7b6ecd707c7..c4aebdeafaa 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 39af92e571b..959d9a35d3c 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 f656057a993..06342fef7b9 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 cca688f4843..34d491795bf 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 157077149b1..a94cd0ef792 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 745b801f69e..9ee503a8a26 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 c1ff5b55f55..c47ff1fcd8f 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 84b3131d34b..750c1aa9cd1 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 0d6ca995c3e..1a43b8e6525 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 460597cdec8..e9563117059 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 f3080ca1b2e..98e73365605 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 978b21df5c5..bf63429fc4a 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 e0dd98646fa..cf3f36482c6 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 da5c15c6497..85bc1286bc0 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 1ba21e1dfa5..003881c38ef 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 bdcfee8da4d..f959c61bfcb 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 b86e095d608..ec0d743f4bd 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 33c6b7e7972..aa860231081 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 918402ee5f0..86758165f47 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 9121e41ca77..47abf6a37ef 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 56edeed157a..8d8dbe89cbf 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 88ce7867c6a..350b7dbde6b 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 27241db1188..fcb9491312e 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 29066c09c72..80ffe24f605 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 c40ff3a9501..d50ac607941 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 3e14401b280..91af6555233 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 d642dda58f6..d4179030d09 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 bf143ff9f1e..8c69e6bf30b 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 a803022aedc..7848c7dc1c2 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 c7a864e6aa0..07341e88d1c 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 8c23af6ff09..c103da8614a 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 ca58705e099..d3e950d9549 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 a15a620d642..737b1f81b8d 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 96686639ecf..c3437eb9e73 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 91a967deef1..7744eb76735 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 1883836b5f3..b2239701937 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 cf778901048..f542b86e69e 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 6821466ba18..18299455dd2 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 495cbe71148..844b6802da3 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 6c7b68ec377..12b527f6920 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 ff1fbe5af40..0d434fd659c 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 e981e886f14..8869f259c27 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 54c52488e17..d11a2c54e91 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 a0a3547fad7..f719d6f0a39 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 f50a2473a97..a3591fdf6e2 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 3923d37f7da..b7afe17a3ba 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 e307f1ca0e3..350fe826ca8 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 9e823e3dd45..96c144adacf 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 49ec33e2654..da9e9f5d761 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 349080659ad..a6b24063040 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 7699f86817e..d869a77a847 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 1685ae09e5f..071f17176ad 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 fb219775d1e..9e88de271da 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 7affa46fa9d..e9c8b3f23a4 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 81b29ad9303..4ce1290409e 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 5de9342532c..577cd03604f 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 30c377bed0b..4dfac3adc78 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 62a93e08460..51ff5cb65d6 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 f49fc5aff48..2b6c2d101c8 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 01abc38002a..ba9a7871c7e 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 2ad7fe043c5..34e100efe0b 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 9f12c54b0e8..128e0016986 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 9315758d71b..93251259949 100644 --- a/compiler/frontend/builtins/jet/LongIterator.kotlin_class +++ b/compiler/frontend/builtins/jet/LongIterator.kotlin_class @@ -1,7 +1,7 @@ -& ¢2 - -R Æ0B -dZ +&«2 + +R Æ0B +«Z 0B -Z &0£B - \ No newline at end of file +Z &0£B + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/LongProgression.kotlin_class b/compiler/frontend/builtins/jet/LongProgression.kotlin_class index 289cef019e3..1c134668611 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.kotlin_class b/compiler/frontend/builtins/jet/LongRange.kotlin_class index d6ff235851e..9ff9fe6b327 100644 Binary files a/compiler/frontend/builtins/jet/LongRange.kotlin_class and b/compiler/frontend/builtins/jet/LongRange.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class index 7bf7f941072..f2e96909888 100644 --- a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class +++ b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class @@ -1,4 +1,4 @@ -† ¥2 -R Â0B -fZ Æ 0IB - \ No newline at end of file +†­2 +R Â0B +­Z Æ 0IB + \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Map.Entry.kotlin_class b/compiler/frontend/builtins/jet/Map.Entry.kotlin_class index 1bd74cbc94b..c2e34257c72 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 2b3383bd406..862c9239bea 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 778161563a0..a2a0d68d674 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 2a20acdd159..eb1d47a5300 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 31e207fadad..a76dc2ee1c3 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 53ca0b3f047..d0092d555a1 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 91a56c46892..d87f533f27b 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 94b3bd3c8bb..d4ae151595e 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 7a4600f828a..10c44af87cc 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 308cce989ad..c4388604c34 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 a3c038ba10f..5da870a6e3b 100644 --- a/compiler/frontend/builtins/jet/Nothing.kotlin_class +++ b/compiler/frontend/builtins/jet/Nothing.kotlin_class @@ -1,2 +1,2 @@ - ÇR Â0B -r \ No newline at end of file +¹R Â0B +¹ \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/Number.kotlin_class b/compiler/frontend/builtins/jet/Number.kotlin_class index 214a7903a58..b2c01ede094 100644 --- a/compiler/frontend/builtins/jet/Number.kotlin_class +++ b/compiler/frontend/builtins/jet/Number.kotlin_class @@ -1,17 +1,17 @@ -& 2 -%R Æ0B - Z -&06B +& 2 +(R Æ0B  Z +&06B + Z &07B -Z -&08B Z -&09B +&08B Z -&0:B -Z -&0;B +&09B Z +&0:B +Z +&0;B +Z &0required int32 name = 4; + * required int32 fq_name = 3; */ - boolean hasName(); + boolean hasFqName(); /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - int getName(); + int getFqName(); // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; /** @@ -4537,9 +4537,9 @@ public final class ProtoBuf { extraVisibility_ = input.readBytes(); break; } - case 32: { + case 24: { bitField0_ |= 0x00000004; - name_ = input.readInt32(); + fqName_ = input.readInt32(); break; } case 42: { @@ -4890,20 +4890,20 @@ public final class ProtoBuf { } } - // required int32 name = 4; - public static final int NAME_FIELD_NUMBER = 4; - private int name_; + // required int32 fq_name = 3; + public static final int FQ_NAME_FIELD_NUMBER = 3; + private int fqName_; /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public boolean hasName() { + public boolean hasFqName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public int getName() { - return name_; + public int getFqName() { + return fqName_; } // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; @@ -5141,7 +5141,7 @@ public final class ProtoBuf { private void initFields() { flags_ = 0; extraVisibility_ = ""; - name_ = 0; + fqName_ = 0; typeParameter_ = java.util.Collections.emptyList(); supertype_ = java.util.Collections.emptyList(); nestedClassName_ = java.util.Collections.emptyList(); @@ -5156,7 +5156,7 @@ public final class ProtoBuf { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasName()) { + if (!hasFqName()) { memoizedIsInitialized = 0; return false; } @@ -5198,7 +5198,7 @@ public final class ProtoBuf { output.writeBytes(2, getExtraVisibilityBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(4, name_); + output.writeInt32(3, fqName_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(5, typeParameter_.get(i)); @@ -5242,7 +5242,7 @@ public final class ProtoBuf { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, name_); + .computeInt32Size(3, fqName_); } for (int i = 0; i < typeParameter_.size(); i++) { size += com.google.protobuf.CodedOutputStream @@ -5386,7 +5386,7 @@ public final class ProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); extraVisibility_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - name_ = 0; + fqName_ = 0; bitField0_ = (bitField0_ & ~0x00000004); typeParameter_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000008); @@ -5438,7 +5438,7 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.name_ = name_; + result.fqName_ = fqName_; if (((bitField0_ & 0x00000008) == 0x00000008)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); bitField0_ = (bitField0_ & ~0x00000008); @@ -5491,8 +5491,8 @@ public final class ProtoBuf { extraVisibility_ = other.extraVisibility_; } - if (other.hasName()) { - setName(other.getName()); + if (other.hasFqName()) { + setFqName(other.getFqName()); } if (!other.typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) { @@ -5564,7 +5564,7 @@ public final class ProtoBuf { } public final boolean isInitialized() { - if (!hasName()) { + if (!hasFqName()) { return false; } @@ -5781,35 +5781,35 @@ public final class ProtoBuf { return this; } - // required int32 name = 4; - private int name_ ; + // required int32 fq_name = 3; + private int fqName_ ; /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public boolean hasName() { + public boolean hasFqName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public int getName() { - return name_; + public int getFqName() { + return fqName_; } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public Builder setName(int value) { + public Builder setFqName(int value) { bitField0_ |= 0x00000004; - name_ = value; + fqName_ = value; return this; } /** - * required int32 name = 4; + * required int32 fq_name = 3; */ - public Builder clearName() { + public Builder clearFqName() { bitField0_ = (bitField0_ & ~0x00000004); - name_ = 0; + fqName_ = 0; return this; } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java index ad648d7896d..e10de6faec7 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java @@ -35,6 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; @@ -45,7 +46,7 @@ import static org.jetbrains.jet.descriptors.serialization.TypeDeserializer.TypeP import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; -public class DeserializedClassDescriptor extends ClassDescriptorBase implements ClassDescriptor { +public class DeserializedClassDescriptor extends AbstractClassDescriptor implements ClassDescriptor { private final ClassId classId; private final ProtoBuf.Class classProto; @@ -64,6 +65,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements private final NestedClassDescriptors nestedClasses; private final NestedClassDescriptors nestedObjects; + private final NotNullLazyValue containingDeclaration; private final DeserializedClassTypeConstructor typeConstructor; private final Modality modality; private final Visibility visibility; @@ -73,29 +75,33 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements private final DescriptorFinder descriptorFinder; public DeserializedClassDescriptor( - @NotNull ClassId classId, @NotNull StorageManager storageManager, - @NotNull DeclarationDescriptor containingDeclaration, - @NotNull NameResolver nameResolver, @NotNull AnnotationDeserializer annotationResolver, @NotNull final DescriptorFinder descriptorFinder, - @NotNull ProtoBuf.Class classProto, - @Nullable TypeDeserializer outerTypeDeserializer + @NotNull ClassData classData ) { - super(containingDeclaration, nameResolver.getName(classProto.getName())); + super(classData.getNameResolver().getClassId(classData.getClassProto().getFqName()).getRelativeClassName().shortName()); + NameResolver nameResolver = classData.getNameResolver(); + this.classProto = classData.getClassProto(); - this.classId = classId; - this.classProto = classProto; + this.classId = nameResolver.getClassId(classProto.getFqName()); this.descriptorFinder = descriptorFinder; - TypeDeserializer notNullTypeDeserializer = new TypeDeserializer(storageManager, outerTypeDeserializer, nameResolver, - descriptorFinder, "Deserializer for class " + getName(), NONE); + TypeDeserializer notNullTypeDeserializer = new TypeDeserializer(storageManager, null, nameResolver, + descriptorFinder, "Deserializer for class " + name, NONE); DescriptorDeserializer outerDeserializer = DescriptorDeserializer.create(storageManager, notNullTypeDeserializer, this, nameResolver, annotationResolver); List typeParameters = new ArrayList(classProto.getTypeParameterCount()); this.deserializer = outerDeserializer.createChildDeserializer(this, classProto.getTypeParameterList(), typeParameters); this.typeDeserializer = deserializer.getTypeDeserializer(); + this.containingDeclaration = storageManager.createLazyValue(new Computable() { + @Override + public DeclarationDescriptor compute() { + return computeContainingDeclaration(); + } + }); + this.typeConstructor = new DeserializedClassTypeConstructor(typeParameters); this.memberScope = new DeserializedClassMemberScope(storageManager, this); this.innerClassesScope = new InnerClassesScopeWrapper(memberScope); @@ -131,13 +137,13 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements this.nestedClasses = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedClassNameList(), nameResolver)) { @Override protected ClassDescriptor resolveNestedClass(@NotNull Name name) { - return descriptorFinder.findClass(DeserializedClassDescriptor.this.classId.createNestedClassId(name)); + return descriptorFinder.findClass(classId.createNestedClassId(name)); } }; this.nestedObjects = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedObjectNameList(), nameResolver)) { @Override protected ClassDescriptor resolveNestedClass(@NotNull Name name) { - return descriptorFinder.findClass(DeserializedClassDescriptor.this.classId.createNestedClassId(name)); + return descriptorFinder.findClass(classId.createNestedClassId(name)); } }; } @@ -151,6 +157,20 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements return result; } + @NotNull + @Override + public DeclarationDescriptor getContainingDeclaration() { + return containingDeclaration.compute(); + } + + @NotNull + private DeclarationDescriptor computeContainingDeclaration() { + ClassOrNamespaceDescriptor result = classId.isTopLevelClass() ? + descriptorFinder.findPackage(classId.getPackageFqName()) : + descriptorFinder.findClass(classId.getOuterClassId()); + return result != null ? result : ErrorUtils.getErrorModule(); + } + @NotNull @Override public TypeConstructor getTypeConstructor() { diff --git a/compiler/testData/cli/wrongAbiVersion.out b/compiler/testData/cli/wrongAbiVersion.out index d8ee22b66b5..2e6d10b255b 100644 --- a/compiler/testData/cli/wrongAbiVersion.out +++ b/compiler/testData/cli/wrongAbiVersion.out @@ -1,5 +1,5 @@ WARNING: $TESTDATA_DIR$/wrongAbiVersion.kt: (3, 9) Parameter 'x' is never used ERROR: $TESTDATA_DIR$/wrongAbiVersion.kt: (4, 3) Unresolved reference: bar -ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong.WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 7 -ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 7 +ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong.WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 8 +ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 8 COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar b/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar index c525df804cb..1e6926f8ba3 100644 Binary files a/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar and b/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar differ diff --git a/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar b/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar index b0b5c56fa9a..2c0a8d75518 100644 Binary files a/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar and b/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar differ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar index e9c28a7f36d..a52d47d5033 100644 Binary files a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar and b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar differ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar index e9c28a7f36d..a52d47d5033 100644 Binary files a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar and b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar differ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar index bd34d7a66ae..7523ae2bc0f 100644 Binary files a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar and b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar differ diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java index 1a0755379e5..26611bce03d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java @@ -25,7 +25,7 @@ public final class JvmAbi { * This constant is used to identify binary format (class file) versions * If you change class file metadata format and/or naming conventions, please increase this number */ - public static final int VERSION = 7; + public static final int VERSION = 8; public static final String TRAIT_IMPL_CLASS_NAME = "$TImpl"; public static final String TRAIT_IMPL_SUFFIX = "$" + TRAIT_IMPL_CLASS_NAME; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index a3a9f345e95..6759ecf63f4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -21,7 +21,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.descriptors.serialization.ClassId; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -192,20 +191,7 @@ public final class JavaClassResolver { //TODO: correct scope VirtualFile file = virtualFileFinder.find(qualifiedName); if (file != null) { - //TODO: code duplication - //TODO: it is a hackish way to determine whether it is inner class or not - boolean isInnerClass = file.getName().contains("$"); - ClassOrNamespaceDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, isInnerClass); - // class may be resolved during resolution of parent - ClassDescriptor cachedDescriptor = classDescriptorCache.get(javaClassToKotlinFqName(qualifiedName)); - if (cachedDescriptor != null) { - return cachedDescriptor; - } - assert !unresolvedCache.contains(qualifiedName.toUnsafe()) - : "We can resolve the class, so it can't be 'unresolved' during parent resolution"; - - ClassId id = ClassId.fromFqNameAndContainingDeclaration(qualifiedName.toUnsafe(), containingDeclaration); - ClassDescriptor deserializedDescriptor = deserializedDescriptorResolver.resolveClass(id, file); + ClassDescriptor deserializedDescriptor = deserializedDescriptorResolver.resolveClass(file); if (deserializedDescriptor != null) { cache(javaClassToKotlinFqName(qualifiedName), deserializedDescriptor); return deserializedDescriptor; @@ -234,7 +220,6 @@ public final class JavaClassResolver { return alreadyResolved; } - //TODO: code duplication ClassOrNamespaceDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, javaClass.getOuterClass() != null); // class may be resolved during resolution of parent ClassDescriptor cachedDescriptor = classDescriptorCache.get(javaClassToKotlinFqName(qualifiedName)); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java index 9c057e96c8c..8cfab0592fe 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java @@ -19,11 +19,12 @@ package org.jetbrains.jet.lang.resolve.kotlin; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.descriptors.serialization.*; +import org.jetbrains.jet.descriptors.serialization.ClassId; +import org.jetbrains.jet.descriptors.serialization.DescriptorFinder; +import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter; import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; @@ -95,36 +96,17 @@ public final class DeserializedDescriptorResolver { } @Nullable - public ClassDescriptor resolveClass(@NotNull ClassId id, @NotNull VirtualFile file) { - String[] data = readData(file); - if (data != null) { - ClassData classData = JavaProtoBufUtil.readClassDataFrom(data); - return createDeserializedClass(classData, id); - } - return null; + public ClassDescriptor resolveClass(@NotNull VirtualFile virtualFile) { + String[] data = readData(virtualFile); + return data == null ? null : new DeserializedClassDescriptor(storageManager, annotationDeserializer, javaDescriptorFinder, + JavaProtoBufUtil.readClassDataFrom(data)); } @Nullable - public JetScope createKotlinPackageScope(@NotNull NamespaceDescriptor descriptor, @NotNull VirtualFile file) { - String[] data = readData(file); - if (data != null) { - PackageData packageData = JavaProtoBufUtil.readPackageDataFrom(data); - return new DeserializedPackageMemberScope(storageManager, descriptor, annotationDeserializer, javaDescriptorFinder, - packageData); - } - return null; - } - - @Nullable - private ClassDescriptor createDeserializedClass(@NotNull ClassData classData, @NotNull ClassId classId) { - DeclarationDescriptor owner = classId.isTopLevelClass() - ? javaNamespaceResolver.resolveNamespace(classId.getPackageFqName(), INCLUDE_KOTLIN_SOURCES) - : javaClassResolver.resolveClass(kotlinFqNameToJavaFqName(classId.getOuterClassId().asSingleFqName()), - IGNORE_KOTLIN_SOURCES); - assert owner != null : "No owner found for " + classId; - - return new DeserializedClassDescriptor(classId, storageManager, owner, classData.getNameResolver(), - annotationDeserializer, javaDescriptorFinder, classData.getClassProto(), null); + public JetScope createKotlinPackageScope(@NotNull NamespaceDescriptor descriptor, @NotNull VirtualFile virtualFile) { + String[] data = readData(virtualFile); + return data == null ? null : new DeserializedPackageMemberScope(storageManager, descriptor, annotationDeserializer, + javaDescriptorFinder, JavaProtoBufUtil.readPackageDataFrom(data)); } @Nullable diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java index d63603f1dfc..62ba337e761 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java @@ -120,7 +120,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { ProtoBuf.Class classProto = ProtoBuf.Class.parseFrom(stream); Name expectedShortName = classId.getRelativeClassName().shortName(); - Name actualShortName = nameResolver.getName(classProto.getName()); + Name actualShortName = nameResolver.getClassId(classProto.getFqName()).getRelativeClassName().shortName(); if (!actualShortName.isSpecial() && !actualShortName.equals(expectedShortName)) { // Workaround for case-insensitive file systems, // otherwise we'd find "Collection" for "collection" etc diff --git a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar index 5d4aeefb604..22d2c988d22 100644 Binary files a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar and b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar differ diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar index 37b7d3b6c61..65814ae7788 100644 Binary files a/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar and b/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar differ diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar index 5a6d86533bb..2958dd9c039 100644 Binary files a/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar and b/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar differ