diff --git a/compiler/frontend/builtins/jet/Array.kotlin_class b/compiler/frontend/builtins/jet/Array.kotlin_class index ce75b42e9a8..9bd38f9f3f1 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/BooleanArray.kotlin_class b/compiler/frontend/builtins/jet/BooleanArray.kotlin_class index 068c1d6ede6..68ba918bf24 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/ByteArray.kotlin_class b/compiler/frontend/builtins/jet/ByteArray.kotlin_class index afe72e4f7d1..7fce5a2dcc9 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/ByteProgression.kotlin_class b/compiler/frontend/builtins/jet/ByteProgression.kotlin_class index 6d8df9f3c0e..62b452e2106 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 e22038570f5..6cccfad1f35 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 e095c1cd6a5..2e656f1f064 100644 Binary files a/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class and b/compiler/frontend/builtins/jet/ByteRange.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/CharArray.kotlin_class b/compiler/frontend/builtins/jet/CharArray.kotlin_class index 6014612dab9..af0fe5cc8f0 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/CharProgression.kotlin_class b/compiler/frontend/builtins/jet/CharProgression.kotlin_class index a2b71d66402..c129da341af 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 ff0548bd92d..9d1acb5f952 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 4ac4de55f1f..f604a57fb17 100644 Binary files a/compiler/frontend/builtins/jet/CharRange.object.kotlin_class and b/compiler/frontend/builtins/jet/CharRange.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/CharSequence.kotlin_class b/compiler/frontend/builtins/jet/CharSequence.kotlin_class index a297a47cb04..d8444cecb74 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/DoubleArray.kotlin_class b/compiler/frontend/builtins/jet/DoubleArray.kotlin_class index 2627d935717..6b5560f17fa 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/DoubleProgression.kotlin_class b/compiler/frontend/builtins/jet/DoubleProgression.kotlin_class index 9e4c014de1e..fa3b67215c8 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 abe416976b5..57bc0020852 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 c8bb1c74d82..cefbdfb77e0 100644 Binary files a/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class and b/compiler/frontend/builtins/jet/DoubleRange.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/FloatArray.kotlin_class b/compiler/frontend/builtins/jet/FloatArray.kotlin_class index a0c71034451..1b266c7ef77 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/FloatProgression.kotlin_class b/compiler/frontend/builtins/jet/FloatProgression.kotlin_class index 40bfa6fadbe..d2ac47c8d3a 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 b7b6ce5965f..78e9f98ac39 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 be5f4021d43..b06978845a7 100644 Binary files a/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class and b/compiler/frontend/builtins/jet/FloatRange.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/IntArray.kotlin_class b/compiler/frontend/builtins/jet/IntArray.kotlin_class index 86355e0bbf6..f747b542391 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/IntProgression.kotlin_class b/compiler/frontend/builtins/jet/IntProgression.kotlin_class index 84560c0db5b..9a498266e7d 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 78885a28460..cb5506899ed 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 ee104a5eeda..cbbc84f2d44 100644 Binary files a/compiler/frontend/builtins/jet/IntRange.object.kotlin_class and b/compiler/frontend/builtins/jet/IntRange.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/LongArray.kotlin_class b/compiler/frontend/builtins/jet/LongArray.kotlin_class index 1f1b6b96919..7abe8e9563c 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/LongProgression.kotlin_class b/compiler/frontend/builtins/jet/LongProgression.kotlin_class index 2372981deef..074b911312e 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 c42bc326afa..4a3cbfb3299 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 f56d7852764..72c802ffc88 100644 Binary files a/compiler/frontend/builtins/jet/LongRange.object.kotlin_class and b/compiler/frontend/builtins/jet/LongRange.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/Progression.kotlin_class b/compiler/frontend/builtins/jet/Progression.kotlin_class index 104e516effe..54362ffcb0f 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 47f8ad06d0c..a2b7e7cde6e 100644 --- a/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class +++ b/compiler/frontend/builtins/jet/PropertyMetadata.kotlin_class @@ -1,3 +1,3 @@ fÀ2 -Z æ0aB +Z æ0aB % \ No newline at end of file diff --git a/compiler/frontend/builtins/jet/PropertyMetadataImpl.kotlin_class b/compiler/frontend/builtins/jet/PropertyMetadataImpl.kotlin_class index 3d6330a69ef..629e734e597 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/Range.kotlin_class b/compiler/frontend/builtins/jet/Range.kotlin_class index d1e3192cca2..8f1c0decb5e 100644 Binary files a/compiler/frontend/builtins/jet/Range.kotlin_class and b/compiler/frontend/builtins/jet/Range.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ShortArray.kotlin_class b/compiler/frontend/builtins/jet/ShortArray.kotlin_class index 8c7f477ef04..0da61a81830 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/ShortProgression.kotlin_class b/compiler/frontend/builtins/jet/ShortProgression.kotlin_class index a2cbac9e52e..aea3ce6751b 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.kotlin_class b/compiler/frontend/builtins/jet/ShortRange.kotlin_class index c19eb5f9575..f9177e4fb47 100644 Binary files a/compiler/frontend/builtins/jet/ShortRange.kotlin_class and b/compiler/frontend/builtins/jet/ShortRange.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class b/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class index 5f9f82e5a84..ffac86358fc 100644 Binary files a/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class and b/compiler/frontend/builtins/jet/ShortRange.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/String.kotlin_class b/compiler/frontend/builtins/jet/String.kotlin_class index ccd975bc5fe..985871b7bbb 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/Unit.object.kotlin_class b/compiler/frontend/builtins/jet/Unit.object.kotlin_class index f789d5a79aa..e693e856030 100644 Binary files a/compiler/frontend/builtins/jet/Unit.object.kotlin_class and b/compiler/frontend/builtins/jet/Unit.object.kotlin_class differ diff --git a/compiler/frontend/builtins/jet/inline.kotlin_class b/compiler/frontend/builtins/jet/inline.kotlin_class index ef684877f69..5a9a405927d 100644 --- a/compiler/frontend/builtins/jet/inline.kotlin_class +++ b/compiler/frontend/builtins/jet/inline.kotlin_class @@ -1,5 +1,5 @@ †Ë2 -Z Æ0âB +Z Æ0âB _j Æ0: â _B 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 b7e8e2e22b4..25fc411e2cc 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 @@ -201,8 +201,6 @@ public class DescriptorSerializer { descriptor.getModality(), descriptor.getKind(), callableKind(descriptor), - descriptor instanceof SimpleFunctionDescriptor && - ((SimpleFunctionDescriptor) descriptor).isInline(), hasGetter, hasSetter )); diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java index cab0475ea9e..be40b68cb6a 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java @@ -28,9 +28,7 @@ public class Flags { public static final FlagField MEMBER_KIND = FlagField.after(CALLABLE_KIND, ProtoBuf.Callable.MemberKind.values()); - @Deprecated - public static final FlagField INLINE = FlagField.booleanAfter(MEMBER_KIND); - public static final FlagField HAS_GETTER = FlagField.booleanAfter(INLINE); + public static final FlagField HAS_GETTER = FlagField.booleanAfter(MEMBER_KIND); public static final FlagField HAS_SETTER = FlagField.booleanAfter(HAS_GETTER); // Parameters @@ -94,7 +92,6 @@ public class Flags { @NotNull Modality modality, @NotNull CallableMemberDescriptor.Kind memberKind, @NotNull ProtoBuf.Callable.CallableKind callableKind, - boolean inline, boolean hasGetter, boolean hasSetter ) { @@ -103,7 +100,6 @@ public class Flags { | VISIBILITY.toFlags(visibility(visibility)) | MEMBER_KIND.toFlags(memberKind(memberKind)) | CALLABLE_KIND.toFlags(callableKind) - | INLINE.toFlags(inline) | HAS_GETTER.toFlags(hasGetter) | HAS_SETTER.toFlags(hasSetter) ;