IR: {IrClass, IrFunction, IrProperty, IrField}.isExternal

compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt

@@ -1,5 +1,5 @@
 FILE fqName:<root> fileName:/constExpressionsInAnnotationArguments.kt
-  PROPERTY name:ONE type:kotlin.Int visibility:public modality:FINAL flags:constmval
+  PROPERTY name:ONE type:kotlin.Int visibility:public modality:FINAL flags:const,val
     FIELD PROPERTY_BACKING_FIELD name:ONE type:kotlin.Int visibility:public flags:final
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=1

compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt

@@ -17,7 +17,7 @@ FILE fqName:<root> fileName:/delegateFieldWithAnnotations.kt
       overridden:
         FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
-  PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval
+  PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:test1$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final
       annotations:
         CALL 'constructor Ann()' type=Ann origin=null

compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt

@@ -84,7 +84,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
       overridden:
         FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
-  PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval
+  PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:test1$delegate type:Cell visibility:private flags:final
       EXPRESSION_BODY
         CALL 'constructor Cell(Int)' type=Cell origin=null
@@ -99,7 +99,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
             $this: GET_FIELD '`test1$delegate`: Cell' type=Cell origin=null
             thisRef: CONST Null type=kotlin.Nothing? value=null
             kProp: PROPERTY_REFERENCE 'test1: Int' field=null getter='<get-test1>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
-  PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmvar
+  PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
     FIELD DELEGATE name:test2$delegate type:Cell visibility:private flags:final
       EXPRESSION_BODY
         CALL 'constructor Cell(Int)' type=Cell origin=null

compiler/testData/ir/irText/declarations/classLevelProperties.txt

@@ -84,7 +84,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
           RETURN type=kotlin.Nothing from='<get-test6>(): Int'
             GET_FIELD 'test6: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
-    PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval
+    PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
       FIELD DELEGATE name:test7$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final
         EXPRESSION_BODY
           CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
@@ -105,7 +105,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
                 receiver: GET_VAR 'this@C: C' type=C origin=null
               thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test7: Int' field=null getter='<get-test7>(): Int' setter=null type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
-    PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmvar
+    PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
       FIELD DELEGATE name:test8$delegate type:kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ visibility:private flags:final
         EXPRESSION_BODY
           CALL 'hashMapOf(): HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null

compiler/testData/ir/irText/declarations/delegatedProperties.txt

@@ -1,5 +1,5 @@
 FILE fqName:<root> fileName:/delegatedProperties.kt
-  PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval
+  PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:test1$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final
       EXPRESSION_BODY
         CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
@@ -37,7 +37,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
           RETURN type=kotlin.Nothing from='<get-map>(): MutableMap<String, Any>'
             GET_FIELD 'map: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
-    PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval
+    PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
       FIELD DELEGATE name:test2$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final
         EXPRESSION_BODY
           CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
@@ -58,7 +58,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
                 receiver: GET_VAR 'this@C: C' type=C origin=null
               thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test2: Int' field=null getter='<get-test2>(): Int' setter=null type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
-    PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:delegatedmvar
+    PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var
       FIELD DELEGATE name:test3$delegate type:kotlin.collections.MutableMap<kotlin.String, kotlin.Any> visibility:private flags:final
         EXPRESSION_BODY
           CALL '<get-map>(): MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=GET_PROPERTY
@@ -99,7 +99,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
       overridden:
         FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
-  PROPERTY name:test4 type:kotlin.Any visibility:public modality:FINAL flags:delegatedmvar
+  PROPERTY name:test4 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var
     FIELD DELEGATE name:test4$delegate type:kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ visibility:private flags:final
       EXPRESSION_BODY
         CALL 'hashMapOf(): HashMap<String, Any> /* = HashMap<String, Any> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ origin=null

compiler/testData/ir/irText/declarations/packageLevelProperties.txt

@@ -59,7 +59,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test6>(): Int'
           GET_FIELD 'test6: Int' type=kotlin.Int origin=null
-  PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval
+  PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:test7$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final
       EXPRESSION_BODY
         CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
@@ -78,7 +78,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
             $receiver: GET_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
             thisRef: CONST Null type=kotlin.Nothing? value=null
             property: PROPERTY_REFERENCE 'test7: Int' field=null getter='<get-test7>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
-  PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmvar
+  PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
     FIELD DELEGATE name:test8$delegate type:kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ visibility:private flags:final
       EXPRESSION_BODY
         CALL 'hashMapOf(): HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null

compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt

@@ -46,7 +46,7 @@ FILE fqName:<root> fileName:/differentReceivers.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='getValue(Any?, Any) on String: String'
         GET_VAR 'this@getValue: String' type=kotlin.String origin=null
-  PROPERTY name:testO type:kotlin.String visibility:public modality:FINAL flags:delegatedmval
+  PROPERTY name:testO type:kotlin.String visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:testO$delegate type:kotlin.String visibility:private flags:final
       EXPRESSION_BODY
         CALL 'provideDelegate(Any?, Any) on MyClass: String' type=kotlin.String origin=null
@@ -61,7 +61,7 @@ FILE fqName:<root> fileName:/differentReceivers.kt
             $receiver: GET_FIELD '`testO$delegate`: String' type=kotlin.String origin=null
             receiver: CONST Null type=kotlin.Nothing? value=null
             p: PROPERTY_REFERENCE 'testO: String' field=null getter='<get-testO>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
-  PROPERTY name:testK type:kotlin.String visibility:public modality:FINAL flags:delegatedmval
+  PROPERTY name:testK type:kotlin.String visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:testK$delegate type:kotlin.String visibility:private flags:final
       EXPRESSION_BODY
         CONST String type=kotlin.String value=K

compiler/testData/ir/irText/declarations/provideDelegate/member.txt

@@ -88,7 +88,7 @@ FILE fqName:<root> fileName:/member.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
-    PROPERTY name:testMember type:kotlin.String visibility:public modality:FINAL flags:delegatedmval
+    PROPERTY name:testMember type:kotlin.String visibility:public modality:FINAL flags:delegated,val
       FIELD DELEGATE name:testMember$delegate type:Delegate visibility:private flags:final
         EXPRESSION_BODY
           CALL 'provideDelegate(Any?, Any?): Delegate' type=Delegate origin=null

compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt

@@ -58,7 +58,7 @@ FILE fqName:<root> fileName:/memberExtension.kt
         RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any) on String: Host.StringDelegate'
           CALL 'constructor StringDelegate(String)' type=Host.StringDelegate origin=null
             s: GET_VAR 'this@provideDelegate: String' type=kotlin.String origin=null
-    PROPERTY name:plusK type:kotlin.String visibility:public modality:FINAL flags:delegatedmval
+    PROPERTY name:plusK type:kotlin.String visibility:public modality:FINAL flags:delegated,val
       FIELD DELEGATE name:plusK$delegate type:Host.StringDelegate visibility:private flags:final
         EXPRESSION_BODY
           CALL 'provideDelegate(Any?, Any) on String: Host.StringDelegate' type=Host.StringDelegate origin=null

compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt

@@ -80,7 +80,7 @@ FILE fqName:<root> fileName:/topLevel.kt
       overridden:
         FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
-  PROPERTY name:testTopLevel type:kotlin.String visibility:public modality:FINAL flags:delegatedmval
+  PROPERTY name:testTopLevel type:kotlin.String visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:testTopLevel$delegate type:Delegate visibility:private flags:final
       EXPRESSION_BODY
         CALL 'provideDelegate(Any?, Any?): Delegate' type=Delegate origin=null

compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt

@@ -393,7 +393,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractCollection<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final
         FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN <T> (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array<out (T..T?)>?) flags:
           overridden:
@@ -560,7 +560,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractCollection<K!> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final
         FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN <T> (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array<out (T..T?)>?) flags:
           overridden:
@@ -727,7 +727,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractCollection<V!> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final
         FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN <T> (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array<out (T..T?)>?) flags:
           overridden:
@@ -917,19 +917,19 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FUN FAKE_OVERRIDE name:eq visibility:invisible_fake modality:OPEN <> (p0:kotlin.Any!, p1:kotlin.Any!) returnType:Boolean flags:
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Any! flags:
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p1 index:1 type:kotlin.Any! flags:
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final
       FUN FAKE_OVERRIDE name:hash visibility:public/*package*/ modality:FINAL <> (p0:kotlin.Any!) returnType:Int flags:
         overridden:
@@ -1261,21 +1261,21 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public flags:final
       CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:KeySpliterator modality:FINAL visibility:public/*package*/ flags:
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.KeySpliterator<K, V> flags:
@@ -1358,21 +1358,21 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public flags:final
       CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:TreeNode modality:FINAL visibility:public/*package*/ flags:
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.TreeNode<K, V> flags:
@@ -1583,21 +1583,21 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public flags:final
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public flags:final
       FUN IR_EXTERNAL_DECLARATION_STUB name:capacity visibility:public/*package*/ modality:FINAL <> ($this:java.util.HashMap<K, V>) returnType:Int flags:
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
@@ -1788,7 +1788,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractCollection<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final
         FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN <T> (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array<out (T..T?)>?) flags:
           overridden:
@@ -1957,7 +1957,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractCollection<K!> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final
         FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN <T> (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array<out (T..T?)>?) flags:
           overridden:
@@ -2126,7 +2126,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractCollection<V!> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final
         FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN <T> (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array<out (T..T?)>?) flags:
           overridden:
@@ -2281,19 +2281,19 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FUN IR_EXTERNAL_DECLARATION_STUB name:eq visibility:private modality:OPEN <> (p0:kotlin.Any!, p1:kotlin.Any!) returnType:Boolean flags:
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Any! flags:
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p1 index:1 type:kotlin.Any! flags:
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final
-      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval
+      PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val
         FIELD IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final
       FUN IR_EXTERNAL_DECLARATION_STUB name:hash visibility:public/*package*/ modality:FINAL <> (p0:kotlin.Any!) returnType:Int flags:
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Any! flags:
@@ -2378,7 +2378,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
             FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap.SimpleEntry<K, V> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final
       CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:SimpleImmutableEntry modality:OPEN visibility:public flags:
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap.SimpleImmutableEntry<K, V> flags:
@@ -2427,7 +2427,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
             FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
             UNBOUND: fun toString(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap.SimpleImmutableEntry<K, V> flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val
           FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final
       FUN FAKE_OVERRIDE name:compute visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap<K!, V!>, p0:K!, p1:java.util.function.BiFunction<in K!, in V?, out V?>) returnType:V? flags:
         overridden:

compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt

@@ -48,10 +48,10 @@ MODULE_FRAGMENT name:<built-ins module>
         superClasses:
           UNBOUND: class Any
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:private <> () returnType:kotlin.Int.Companion flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_VALUE type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-MAX_VALUE> visibility:public modality:FINAL <> ($this:kotlin.Int.Companion) returnType:Int flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int.Companion flags:
-        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_VALUE type:kotlin.Int visibility:public modality:FINAL flags:constmval
+        PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-MIN_VALUE> visibility:public modality:FINAL <> ($this:kotlin.Int.Companion) returnType:Int flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int.Companion flags:
         FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: