Make Array.size() a function instead of a property

Also add a deprecated extension property to help migration. This is done to
unify getting size of arrays and collections

compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log

@@ -34,11 +34,11 @@ DeserializedType@21['T in kotlin'] {
 }
 
 DeserializedType@22['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@14
+    constructor = AbstractLazyTypeParameterDescriptor$1@18
 }
 
 DeserializedType@23['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@18
+    constructor = AbstractLazyTypeParameterDescriptor$1@14
 }
 
 DeserializedType@24['java.lang.Class'] {
@@ -294,11 +294,11 @@ LazyJavaTypeParameterResolver@164 {
 }
 
 TypeDeserializer@166 {
-    classDescriptors('27': Integer@167) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@168) = DeserializedClassDescriptor@169['Any']
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('54': Integer@169) = LazyJavaClassDescriptor@42['Class']
 }
 
 TypeDeserializer@170 {
-    classDescriptors('27': Integer@167) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@168) = DeserializedClassDescriptor@169['Any']
+    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('54': Integer@169) = LazyJavaClassDescriptor@42['Class']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log

@@ -44,7 +44,7 @@ DeserializedType@29['T in kotlin'] {
 }
 
 DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@31['T in kotlin'] {
@@ -52,7 +52,7 @@ DeserializedType@31['T in kotlin'] {
 }
 
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@33['java.lang.Class'] {
@@ -60,12 +60,12 @@ DeserializedType@33['java.lang.Class'] {
     memberScope = SubstitutingScope@35
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
@@ -475,16 +475,16 @@ LazyJavaTypeParameterResolver@241 {
 }
 
 TypeDeserializer@243 {
-    classDescriptors('22': Integer@244) = DeserializedClassDescriptor@245['Int']
-    classDescriptors('35': Integer@246) = DeserializedClassDescriptor@247['IntArray']
+    classDescriptors('2': Integer@244) = DeserializedClassDescriptor@245['Any']
+    classDescriptors('3': Integer@246) = DeserializedClassDescriptor@247['Array']
 }
 
 TypeDeserializer@248 {
-    classDescriptors('27': Integer@249) = LazyJavaClassDescriptor@88['Class']
-    classDescriptors('9': Integer@250) = DeserializedClassDescriptor@251['Any']
+    classDescriptors('2': Integer@244) = DeserializedClassDescriptor@245['Any']
+    classDescriptors('54': Integer@249) = LazyJavaClassDescriptor@88['Class']
 }
 
-TypeDeserializer@252 {
-    classDescriptors('8': Integer@253) = DeserializedClassDescriptor@254['Array']
-    classDescriptors('9': Integer@250) = DeserializedClassDescriptor@251['Any']
+TypeDeserializer@250 {
+    classDescriptors('20': Integer@251) = DeserializedClassDescriptor@252['Int']
+    classDescriptors('45': Integer@253) = DeserializedClassDescriptor@254['IntArray']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log

@@ -171,6 +171,6 @@ LazyJavaTypeParameterResolver@104 {
 }
 
 TypeDeserializer@106 {
-    classDescriptors('27': Integer@107) = LazyJavaClassDescriptor@31['Class']
-    classDescriptors('9': Integer@108) = DeserializedClassDescriptor@109['Any']
+    classDescriptors('2': Integer@107) = DeserializedClassDescriptor@108['Any']
+    classDescriptors('54': Integer@109) = LazyJavaClassDescriptor@31['Class']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log

@@ -322,11 +322,11 @@ LazyJavaPackageFragment@85['lang'] {
 }
 
 TypeDeserializer@170 {
-    classDescriptors('22': Integer@171) = DeserializedClassDescriptor@172['Int']
-    classDescriptors('35': Integer@173) = DeserializedClassDescriptor@174['IntArray']
+    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Array']
 }
 
 TypeDeserializer@175 {
-    classDescriptors('8': Integer@176) = DeserializedClassDescriptor@177['Array']
-    classDescriptors('9': Integer@178) = DeserializedClassDescriptor@179['Any']
+    classDescriptors('20': Integer@176) = DeserializedClassDescriptor@177['Int']
+    classDescriptors('45': Integer@178) = DeserializedClassDescriptor@179['IntArray']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log

@@ -40,7 +40,7 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }
 
 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@30['T in kotlin'] {
@@ -52,7 +52,7 @@ DeserializedType@31['T in kotlin'] {
 }
 
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@33['java.lang.Class'] {
@@ -60,12 +60,12 @@ DeserializedType@33['java.lang.Class'] {
     memberScope = SubstitutingScope@35
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
@@ -477,16 +477,16 @@ LazyJavaTypeParameterResolver@243 {
 }
 
 TypeDeserializer@245 {
-    classDescriptors('22': Integer@246) = DeserializedClassDescriptor@247['Int']
-    classDescriptors('35': Integer@248) = DeserializedClassDescriptor@249['IntArray']
+    classDescriptors('2': Integer@246) = DeserializedClassDescriptor@247['Any']
+    classDescriptors('3': Integer@248) = DeserializedClassDescriptor@249['Array']
 }
 
 TypeDeserializer@250 {
-    classDescriptors('27': Integer@251) = LazyJavaClassDescriptor@100['Class']
-    classDescriptors('9': Integer@252) = DeserializedClassDescriptor@253['Any']
+    classDescriptors('2': Integer@246) = DeserializedClassDescriptor@247['Any']
+    classDescriptors('54': Integer@251) = LazyJavaClassDescriptor@100['Class']
 }
 
-TypeDeserializer@254 {
-    classDescriptors('8': Integer@255) = DeserializedClassDescriptor@256['Array']
-    classDescriptors('9': Integer@252) = DeserializedClassDescriptor@253['Any']
+TypeDeserializer@252 {
+    classDescriptors('20': Integer@253) = DeserializedClassDescriptor@254['Int']
+    classDescriptors('45': Integer@255) = DeserializedClassDescriptor@256['IntArray']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log

@@ -42,7 +42,7 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }
 
 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@30['T in kotlin'] {
@@ -50,7 +50,7 @@ DeserializedType@30['T in kotlin'] {
 }
 
 DeserializedType@31['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@32['T in kotlin'] {
@@ -328,11 +328,11 @@ TypeDeserializer@219 {
 }
 
 TypeDeserializer@223 {
-    classDescriptors('27': Integer@224) = LazyJavaClassDescriptor@91['Class']
-    classDescriptors('9': Integer@225) = DeserializedClassDescriptor@226['Any']
+    classDescriptors('2': Integer@224) = DeserializedClassDescriptor@225['Any']
+    classDescriptors('3': Integer@221) = DeserializedClassDescriptor@226['Array']
 }
 
 TypeDeserializer@227 {
-    classDescriptors('8': Integer@228) = DeserializedClassDescriptor@229['Array']
-    classDescriptors('9': Integer@225) = DeserializedClassDescriptor@226['Any']
+    classDescriptors('2': Integer@224) = DeserializedClassDescriptor@225['Any']
+    classDescriptors('54': Integer@228) = LazyJavaClassDescriptor@91['Class']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log

@@ -61,19 +61,19 @@ DeserializedType@39['T in kotlin.reflect.KMemberProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@35
 }
 
-DeserializedType@28['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
-}
-
-DeserializedType@42['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
+DeserializedType@40['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@41
+    memberScope = DeserializedClassMemberScope@42
 }
 
 DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
+    constructor = DeserializedClassTypeConstructor@41
+    memberScope = DeserializedClassMemberScope@42
+}
+
+DeserializedType@28['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@41
+    memberScope = DeserializedClassMemberScope@42
 }
 
 DeserializedType@43['kotlin.CharSequence'] {
@@ -320,13 +320,13 @@ NestedClassDescriptors@159 {
 }
 
 TypeDeserializer@160 {
-    classDescriptors('22': Integer@161) = DeserializedClassDescriptor@162['Int']
-    classDescriptors('40': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
+    classDescriptors('20': Integer@161) = DeserializedClassDescriptor@162['Int']
+    classDescriptors('59': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
 }
 
 TypeDeserializer@165 {
-    classDescriptors('22': Integer@161) = DeserializedClassDescriptor@162['Int']
-    classDescriptors('40': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
+    classDescriptors('20': Integer@161) = DeserializedClassDescriptor@162['Int']
+    classDescriptors('59': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
 }
 
 TypeDeserializer@166 {

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log

@@ -190,15 +190,15 @@ DeserializedType@121['R in kotlin.reflect.KExtensionProperty'] {
 }
 
 DeserializedType@122['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@123['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@124['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@125['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
@@ -210,15 +210,15 @@ DeserializedType@126['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@127['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@128['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@129['T in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@108
+    constructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 DeserializedType@130['T in kotlin.reflect.KMutableExtensionProperty'] {
@@ -238,7 +238,7 @@ DeserializedType@133['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@134['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
+    constructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 DeserializedType@135['V in kotlin'] {
@@ -253,7 +253,7 @@ DeserializedType@137['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
-DeserializedType@105['kotlin.Any'] {
+DeserializedType@71['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -263,26 +263,6 @@ DeserializedType@114['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@76['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@140['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@85['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@81['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
 DeserializedType@66['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
@@ -293,17 +273,37 @@ DeserializedType@100['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
+DeserializedType@140['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
 DeserializedType@118['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@110['kotlin.Any'] {
+DeserializedType@81['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@71['kotlin.Any'] {
+DeserializedType@85['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@105['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@76['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@110['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -628,8 +628,8 @@ NestedClassDescriptors@296 {
 }
 
 TypeDeserializer@297 {
-    classDescriptors('129': Integer@298) = DeserializedClassDescriptor@299['MutableMap']
-    classDescriptors('9': Integer@300) = DeserializedClassDescriptor@301['Any']
+    classDescriptors('102': Integer@298) = DeserializedClassDescriptor@299['MutableMap']
+    classDescriptors('2': Integer@300) = DeserializedClassDescriptor@301['Any']
 }
 
 TypeDeserializer@302 {

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log

@@ -154,22 +154,12 @@ DeserializedType@86['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-DeserializedType@45['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
-}
-
 DeserializedType@71['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@66['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
-}
-
-DeserializedType@55['kotlin.Any'] {
+DeserializedType@45['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
@@ -179,7 +169,7 @@ DeserializedType@50['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@75['kotlin.Any'] {
+DeserializedType@66['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
@@ -189,6 +179,16 @@ DeserializedType@89['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@88
 }
 
+DeserializedType@75['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@87
+    memberScope = DeserializedClassMemberScope@88
+}
+
+DeserializedType@55['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@87
+    memberScope = DeserializedClassMemberScope@88
+}
+
 DeserializedType@90['kotlin.CharSequence'] {
     constructor = DeserializedClassTypeConstructor@91
 }
@@ -461,8 +461,8 @@ NestedClassDescriptors@209 {
 }
 
 TypeDeserializer@210 {
-    classDescriptors('129': Integer@211) = DeserializedClassDescriptor@212['MutableMap']
-    classDescriptors('9': Integer@213) = DeserializedClassDescriptor@214['Any']
+    classDescriptors('102': Integer@211) = DeserializedClassDescriptor@212['MutableMap']
+    classDescriptors('2': Integer@213) = DeserializedClassDescriptor@214['Any']
 }
 
 TypeDeserializer@215 {
@@ -489,11 +489,11 @@ TypeDeserializer@222 {
 }
 
 TypeDeserializer@223 {
-    classDescriptors('40': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
+    classDescriptors('59': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
 }
 
 TypeDeserializer@226 {
-    classDescriptors('40': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
+    classDescriptors('59': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
 }
 
 TypeDeserializer@227 {

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log

@@ -179,27 +179,27 @@ DeserializedType@129['K in kotlin'] {
 }
 
 DeserializedType@130['R in kotlin.reflect.KMutableProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@109
+    constructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 DeserializedType@131['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@105
+    constructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 DeserializedType@132['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@105
+    constructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 DeserializedType@133['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@121
+    constructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 DeserializedType@134['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@121
+    constructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 DeserializedType@135['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@121
+    constructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 DeserializedType@136['R in kotlin.reflect.KMutableVariable'] {
@@ -215,11 +215,11 @@ DeserializedType@138['R in kotlin.reflect.KMutableVariable'] {
 }
 
 DeserializedType@139['R in kotlin.reflect.KProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@117
+    constructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 DeserializedType@140['R in kotlin.reflect.KTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@113
+    constructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
 DeserializedType@141['R in kotlin.reflect.KTopLevelVariable'] {
@@ -250,61 +250,61 @@ DeserializedType@147['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@125
 }
 
-DeserializedType@85['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@115['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@90['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@123['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
 DeserializedType@111['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
 
-DeserializedType@150['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@107['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@95['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@100['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
 DeserializedType@127['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
 
+DeserializedType@100['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@150['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@95['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@107['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
 DeserializedType@119['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
 
+DeserializedType@123['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@115['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@85['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@90['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
 DeserializedType@151['kotlin.MutableMap'] {
     constructor = DeserializedClassTypeConstructor@152
     memberScope = SubstitutingScope@153
@@ -386,17 +386,17 @@ DeserializedType@192['kotlin.reflect.KVariable'] {
 }
 
 EnumEntryClassDescriptors@194 {
-    findEnumEntry('get': Name@195) = null
-    findEnumEntry('name': Name@196) = null
-    findEnumEntry('set': Name@197) = null
-}
-
-EnumEntryClassDescriptors@198 {
     findEnumEntry('get': Name@23) = null
     findEnumEntry('name': Name@28) = null
     findEnumEntry('set': Name@26) = null
 }
 
+EnumEntryClassDescriptors@195 {
+    findEnumEntry('get': Name@196) = null
+    findEnumEntry('name': Name@197) = null
+    findEnumEntry('set': Name@198) = null
+}
+
 LazyJavaPackageFragmentProvider@199 {
     packageFragments('<root>': FqName@200) = LazyJavaPackageFragment@201['<root>']
     packageFragments('Int': FqName@202) = null
@@ -639,14 +639,14 @@ NestedClassDescriptors@334 {
 }
 
 NestedClassDescriptors@335 {
-    findNestedClass('get': Name@195) = null
-    findNestedClass('name': Name@196) = null
-    findNestedClass('set': Name@197) = null
+    findNestedClass('get': Name@196) = null
+    findNestedClass('name': Name@197) = null
+    findNestedClass('set': Name@198) = null
 }
 
 TypeDeserializer@336 {
-    classDescriptors('129': Integer@337) = DeserializedClassDescriptor@338['MutableMap']
-    classDescriptors('9': Integer@339) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('102': Integer@337) = DeserializedClassDescriptor@338['MutableMap']
+    classDescriptors('2': Integer@339) = DeserializedClassDescriptor@340['Any']
 }
 
 TypeDeserializer@341 {

compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log

@@ -198,7 +198,22 @@ DeserializedType@108['java.util.HashMap'] {
     memberScope = SubstitutingScope@110
 }
 
-DeserializedType@50['kotlin.Any'] {
+DeserializedType@54['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@111
+    memberScope = DeserializedClassMemberScope@112
+}
+
+DeserializedType@71['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@111
+    memberScope = DeserializedClassMemberScope@112
+}
+
+DeserializedType@113['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@111
+    memberScope = DeserializedClassMemberScope@112
+}
+
+DeserializedType@59['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@111
     memberScope = DeserializedClassMemberScope@112
 }
@@ -208,11 +223,26 @@ DeserializedType@83['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@112
 }
 
+DeserializedType@79['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@111
+    memberScope = DeserializedClassMemberScope@112
+}
+
 DeserializedType@67['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@111
     memberScope = DeserializedClassMemberScope@112
 }
 
+DeserializedType@50['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@111
+    memberScope = DeserializedClassMemberScope@112
+}
+
+DeserializedType@87['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@111
+    memberScope = DeserializedClassMemberScope@112
+}
+
 DeserializedType@91['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@111
     memberScope = DeserializedClassMemberScope@112
@@ -223,42 +253,12 @@ DeserializedType@75['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@112
 }
 
-DeserializedType@113['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@71['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@87['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@63['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
 DeserializedType@114['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@111
     memberScope = DeserializedClassMemberScope@112
 }
 
-DeserializedType@59['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@79['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@54['kotlin.Any'] {
+DeserializedType@63['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@111
     memberScope = DeserializedClassMemberScope@112
 }
@@ -1205,26 +1205,26 @@ TypeDeserializer@431 {
 }
 
 TypeDeserializer@433 {
-    classDescriptors('2': Integer@434) = DeserializedClassDescriptor@435['Any']
-    classDescriptors('5': Integer@436) = LazyJavaClassDescriptor@140['Serializable']
+    classDescriptors('117': Integer@434) = DeserializedClassDescriptor@8['Pair']
+    classDescriptors('118': Integer@435) = LazyJavaClassDescriptor@139['HashMap']
+    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
+    classDescriptors('3': Integer@438) = DeserializedClassDescriptor@439['Array']
 }
 
-TypeDeserializer@437 {
-    classDescriptors('2': Integer@434) = DeserializedClassDescriptor@435['Any']
+TypeDeserializer@440 {
+    classDescriptors('117': Integer@434) = DeserializedClassDescriptor@8['Pair']
+    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
 }
 
-TypeDeserializer@438 {
-    classDescriptors('2': Integer@434) = DeserializedClassDescriptor@435['Any']
+TypeDeserializer@441 {
+    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
+    classDescriptors('5': Integer@442) = LazyJavaClassDescriptor@140['Serializable']
 }
 
-TypeDeserializer@439 {
-    classDescriptors('8': Integer@440) = DeserializedClassDescriptor@441['Array']
-    classDescriptors('80': Integer@442) = DeserializedClassDescriptor@8['Pair']
-    classDescriptors('81': Integer@443) = LazyJavaClassDescriptor@139['HashMap']
-    classDescriptors('9': Integer@444) = DeserializedClassDescriptor@435['Any']
+TypeDeserializer@443 {
+    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
 }
 
-TypeDeserializer@445 {
-    classDescriptors('80': Integer@442) = DeserializedClassDescriptor@8['Pair']
-    classDescriptors('9': Integer@444) = DeserializedClassDescriptor@435['Any']
+TypeDeserializer@444 {
+    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
 }

compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log

@@ -31,7 +31,7 @@ DeserializedTypeParameterDescriptor@20['T'] {
 }
 
 DeserializedType@24['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@21
+    constructor = AbstractLazyTypeParameterDescriptor$1@17
 }
 
 DeserializedType@25['T in kotlin'] {
@@ -39,7 +39,7 @@ DeserializedType@25['T in kotlin'] {
 }
 
 DeserializedType@26['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@21
+    constructor = AbstractLazyTypeParameterDescriptor$1@17
 }
 
 DeserializedType@27['T in kotlin'] {
@@ -51,12 +51,12 @@ DeserializedType@28['java.lang.Class'] {
     memberScope = SubstitutingScope@30
 }
 
-DeserializedType@23['kotlin.Any'] {
+DeserializedType@19['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@19['kotlin.Any'] {
+DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
@@ -287,11 +287,11 @@ LazyJavaTypeParameterResolver@135 {
 }
 
 TypeDeserializer@137 {
-    classDescriptors('27': Integer@138) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@139) = DeserializedClassDescriptor@140['Any']
+    classDescriptors('2': Integer@138) = DeserializedClassDescriptor@139['Any']
+    classDescriptors('3': Integer@140) = DeserializedClassDescriptor@141['Array']
 }
 
-TypeDeserializer@141 {
-    classDescriptors('8': Integer@142) = DeserializedClassDescriptor@143['Array']
-    classDescriptors('9': Integer@139) = DeserializedClassDescriptor@140['Any']
+TypeDeserializer@142 {
+    classDescriptors('2': Integer@138) = DeserializedClassDescriptor@139['Any']
+    classDescriptors('54': Integer@143) = LazyJavaClassDescriptor@42['Class']
 }