diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt
index 0c099ad028c..840c8690162 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt
@@ -34,6 +34,7 @@ interface IrClass : IrSymbolDeclaration<IrClassSymbol>, IrDeclarationContainer,
     val visibility: Visibility
     val modality: Modality
     val isCompanion: Boolean
+    val isInner: Boolean
     val isData: Boolean
     val isExternal: Boolean
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt
index a021bcd4e3b..80704042821 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt
@@ -40,6 +40,7 @@ class IrClassImpl(
     override val visibility: Visibility,
     override val modality: Modality,
     override val isCompanion: Boolean,
+    override val isInner: Boolean,
     override val isData: Boolean,
     override val isExternal: Boolean
 ) : IrDeclarationBase(startOffset, endOffset, origin),
@@ -50,8 +51,10 @@ class IrClassImpl(
                 startOffset, endOffset, origin, symbol,
                 symbol.descriptor.name, symbol.descriptor.kind,
                 symbol.descriptor.visibility, symbol.descriptor.modality,
-                symbol.descriptor.isCompanionObject, symbol.descriptor.isData,
-                symbol.descriptor.isEffectivelyExternal()
+                isCompanion = symbol.descriptor.isCompanionObject,
+                isInner = symbol.descriptor.isInner,
+                isData = symbol.descriptor.isData,
+                isExternal = symbol.descriptor.isEffectivelyExternal()
             )
 
     constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor) :
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
index 6d43a43675c..5b7f864229a 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
@@ -135,6 +135,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
     private fun IrClass.renderClassFlags() =
         renderFlagsList(
             "companion".takeIf { isCompanion },
+            "inner".takeIf { isInner },
             "data".takeIf { isData },
             "external".takeIf { isExternal }
         )
diff --git a/compiler/testData/ir/irText/classes/initBlock.txt b/compiler/testData/ir/irText/classes/initBlock.txt
index ee854fc4b7a..c271e8bafbc 100644
--- a/compiler/testData/ir/irText/classes/initBlock.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.txt
@@ -123,7 +123,7 @@ FILE fqName:<root> fileName:/initBlock.kt
       BLOCK_BODY
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
           message: CONST String type=kotlin.String value=1
-    CLASS CLASS name:TestInner modality:FINAL visibility:public flags:
+    CLASS CLASS name:TestInner modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test5.TestInner flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/classes/innerClass.txt b/compiler/testData/ir/irText/classes/innerClass.txt
index 85efca66409..9e26235df3e 100644
--- a/compiler/testData/ir/irText/classes/innerClass.txt
+++ b/compiler/testData/ir/irText/classes/innerClass.txt
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/innerClass.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
-    CLASS CLASS name:TestInnerClass modality:OPEN visibility:public flags:
+    CLASS CLASS name:TestInnerClass modality:OPEN visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.TestInnerClass flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -29,10 +29,10 @@ FILE fqName:<root> fileName:/innerClass.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:
-    CLASS CLASS name:DerivedInnerClass modality:FINAL visibility:public flags:
+    CLASS CLASS name:DerivedInnerClass modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.DerivedInnerClass flags:
       superClasses:
-        CLASS CLASS name:TestInnerClass modality:OPEN visibility:public flags:
+        CLASS CLASS name:TestInnerClass modality:OPEN visibility:public flags:inner
       CONSTRUCTOR visibility:public <> ($this:Outer) returnType:Outer.DerivedInnerClass flags:primary
         $outer: VALUE_PARAMETER name:<this> type:Outer flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
index 8ee7608b589..0e3e00884df 100644
--- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
+++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/innerClassWithDelegatingConstructor.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
-    CLASS CLASS name:Inner modality:FINAL visibility:public flags:
+    CLASS CLASS name:Inner modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.Inner flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
index cbd188322c0..8b29dd07276 100644
--- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
+++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
@@ -93,7 +93,7 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
-    CLASS CLASS name:Inner modality:ABSTRACT visibility:public flags:
+    CLASS CLASS name:Inner modality:ABSTRACT visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.Inner flags:
       superClasses:
         CLASS INTERFACE name:IFoo modality:ABSTRACT visibility:public flags:
@@ -127,7 +127,7 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
             CLASS CLASS name:<no name provided> modality:FINAL visibility:local flags:
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.test3.<no name provided> flags:
               superClasses:
-                CLASS CLASS name:Inner modality:ABSTRACT visibility:public flags:
+                CLASS CLASS name:Inner modality:ABSTRACT visibility:public flags:inner
               CONSTRUCTOR visibility:public <> () returnType:Outer.test3.<no name provided> flags:primary
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
@@ -175,7 +175,7 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
           CLASS CLASS name:<no name provided> modality:FINAL visibility:local flags:
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test4.<no name provided> flags:
             superClasses:
-              CLASS CLASS name:Inner modality:ABSTRACT visibility:public flags:
+              CLASS CLASS name:Inner modality:ABSTRACT visibility:public flags:inner
             CONSTRUCTOR visibility:public <> () returnType:test4.<no name provided> flags:primary
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
diff --git a/compiler/testData/ir/irText/classes/outerClassAccess.txt b/compiler/testData/ir/irText/classes/outerClassAccess.txt
index ae25dda715e..1c3dbd06f5b 100644
--- a/compiler/testData/ir/irText/classes/outerClassAccess.txt
+++ b/compiler/testData/ir/irText/classes/outerClassAccess.txt
@@ -10,7 +10,7 @@ FILE fqName:<root> fileName:/outerClassAccess.kt
     FUN name:foo visibility:public modality:FINAL <> ($this:Outer) returnType:Unit flags:
       $this: VALUE_PARAMETER name:<this> type:Outer flags:
       BLOCK_BODY
-    CLASS CLASS name:Inner modality:FINAL visibility:public flags:
+    CLASS CLASS name:Inner modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.Inner flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -24,7 +24,7 @@ FILE fqName:<root> fileName:/outerClassAccess.kt
         BLOCK_BODY
           CALL 'foo(): Unit' type=kotlin.Unit origin=null
             $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
-      CLASS CLASS name:Inner2 modality:FINAL visibility:public flags:
+      CLASS CLASS name:Inner2 modality:FINAL visibility:public flags:inner
         $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.Inner.Inner2 flags:
         superClasses:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/declarations/parameters/class.txt b/compiler/testData/ir/irText/declarations/parameters/class.txt
index d029fee54ae..f3a2fa785aa 100644
--- a/compiler/testData/ir/irText/declarations/parameters/class.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/class.txt
@@ -74,7 +74,7 @@ FILE fqName:<root> fileName:/class.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:
-    CLASS CLASS name:TestInner modality:FINAL visibility:public flags:
+    CLASS CLASS name:TestInner modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test<T0>.TestInner<T2> flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
index b85d6fadd27..a81891cb9ee 100644
--- a/compiler/testData/ir/irText/declarations/parameters/constructor.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
@@ -68,7 +68,7 @@ FILE fqName:<root> fileName:/constructor.kt
           RETURN type=kotlin.Nothing from='<get-y>(): String'
             GET_FIELD 'y: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
-    CLASS CLASS name:TestInner modality:FINAL visibility:public flags:
+    CLASS CLASS name:TestInner modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test2.TestInner<Z> flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
index e6846d08d79..93516aa2633 100644
--- a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
@@ -10,7 +10,7 @@ FILE fqName:<root> fileName:/genericInnerClass.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
-    CLASS CLASS name:Inner modality:FINAL visibility:public flags:
+    CLASS CLASS name:Inner modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer<T1>.Inner<T2> flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/expressions/kt16905.txt b/compiler/testData/ir/irText/expressions/kt16905.txt
index 20d2d852dcf..2a2dc45b26a 100644
--- a/compiler/testData/ir/irText/expressions/kt16905.txt
+++ b/compiler/testData/ir/irText/expressions/kt16905.txt
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/kt16905.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
-    CLASS CLASS name:Inner modality:OPEN visibility:public flags:
+    CLASS CLASS name:Inner modality:OPEN visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.Inner flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -29,10 +29,10 @@ FILE fqName:<root> fileName:/kt16905.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:
-    CLASS CLASS name:InnerDerived0 modality:FINAL visibility:public flags:
+    CLASS CLASS name:InnerDerived0 modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.InnerDerived0 flags:
       superClasses:
-        CLASS CLASS name:Inner modality:OPEN visibility:public flags:
+        CLASS CLASS name:Inner modality:OPEN visibility:public flags:inner
       CONSTRUCTOR visibility:public <> ($this:Outer) returnType:Outer.InnerDerived0 flags:primary
         $outer: VALUE_PARAMETER name:<this> type:Outer flags:
         BLOCK_BODY
@@ -52,10 +52,10 @@ FILE fqName:<root> fileName:/kt16905.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:
-    CLASS CLASS name:InnerDerived1 modality:FINAL visibility:public flags:
+    CLASS CLASS name:InnerDerived1 modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.InnerDerived1 flags:
       superClasses:
-        CLASS CLASS name:Inner modality:OPEN visibility:public flags:
+        CLASS CLASS name:Inner modality:OPEN visibility:public flags:inner
       CONSTRUCTOR visibility:public <> ($this:Outer) returnType:Outer.InnerDerived1 flags:primary
         $outer: VALUE_PARAMETER name:<this> type:Outer flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
index 8570ca4f793..58b5d9da507 100644
--- a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
+++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
-    CLASS CLASS name:Inner modality:OPEN visibility:public flags:
+    CLASS CLASS name:Inner modality:OPEN visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.Inner flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -81,7 +81,7 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
             CLASS CLASS name:<no name provided> modality:FINAL visibility:local flags:
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Host.test.<no name provided> flags:
               superClasses:
-                CLASS CLASS name:Inner modality:OPEN visibility:public flags:
+                CLASS CLASS name:Inner modality:OPEN visibility:public flags:inner
               CONSTRUCTOR visibility:public <> () returnType:Host.test.<no name provided> flags:primary
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'constructor Inner(Int)'
diff --git a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt
index 86a6634d680..ef33150b0ed 100644
--- a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt
+++ b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt
@@ -10,7 +10,7 @@ FILE fqName:<root> fileName:/outerClassInstanceReference.kt
     FUN name:outer visibility:public modality:FINAL <> ($this:Outer) returnType:Unit flags:
       $this: VALUE_PARAMETER name:<this> type:Outer flags:
       BLOCK_BODY
-    CLASS CLASS name:Inner modality:FINAL visibility:public flags:
+    CLASS CLASS name:Inner modality:FINAL visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer.Inner flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
index f4a53a1d158..25ea65c76c3 100644
--- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
+++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
@@ -21,7 +21,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
           RETURN type=kotlin.Nothing from='<get-x>(): T'
             GET_FIELD 'x: T' type=T origin=null
               receiver: GET_VAR 'this@Outer: Outer<T>' type=Outer<T> origin=null
-    CLASS CLASS name:Inner modality:OPEN visibility:public flags:
+    CLASS CLASS name:Inner modality:OPEN visibility:public flags:inner
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Outer<T>.Inner flags:
       superClasses:
         CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -75,7 +75,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
           CLASS CLASS name:<no name provided> modality:FINAL visibility:local flags:
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.<no name provided> flags:
             superClasses:
-              CLASS CLASS name:Inner modality:OPEN visibility:public flags:
+              CLASS CLASS name:Inner modality:OPEN visibility:public flags:inner
             CONSTRUCTOR visibility:public <> () returnType:test.<no name provided> flags:primary
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'constructor Inner(Int)'
diff --git a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt
index c5c5b204610..b57cb5d1fb9 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt
@@ -207,7 +207,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:(kotlin.collections.MutableCollection<(V..V?)>..kotlin.collections.Collection<(V..V?)>?) flags:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableCollection<V> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V> flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedHashIterator flags:
         superClasses:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -238,10 +238,10 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedEntryIterator modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedEntryIterator modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedEntryIterator flags:
         superClasses:
-          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
           UNBOUND: interface MutableIterator<out T> : kotlin.collections.Iterator<T>
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public/*package*/ <> ($this:java.util.LinkedHashMap<K, V>) returnType:java.util.LinkedHashMap<K, V>.LinkedEntryIterator flags:
           $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V> flags:
@@ -290,7 +290,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedEntrySet modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedEntrySet modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedEntrySet flags:
         superClasses:
           UNBOUND: class AbstractSet<E : kotlin.Any!> : java.util.AbstractCollection<E!>, kotlin.collections.MutableSet<E!>
@@ -405,10 +405,10 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun hugeCapacity(p0: kotlin.Int): kotlin.Int
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Int flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedKeyIterator modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedKeyIterator modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedKeyIterator flags:
         superClasses:
-          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
           UNBOUND: interface MutableIterator<out T> : kotlin.collections.Iterator<T>
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public/*package*/ <> ($this:java.util.LinkedHashMap<K, V>) returnType:java.util.LinkedHashMap<K, V>.LinkedKeyIterator flags:
           $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V> flags:
@@ -457,7 +457,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedKeySet modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedKeySet modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedKeySet flags:
         superClasses:
           UNBOUND: class AbstractSet<E : kotlin.Any!> : java.util.AbstractCollection<E!>, kotlin.collections.MutableSet<E!>
@@ -572,10 +572,10 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun hugeCapacity(p0: kotlin.Int): kotlin.Int
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Int flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedValueIterator modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedValueIterator modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedValueIterator flags:
         superClasses:
-          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedHashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
           UNBOUND: interface MutableIterator<out T> : kotlin.collections.Iterator<T>
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public/*package*/ <> ($this:java.util.LinkedHashMap<K, V>) returnType:java.util.LinkedHashMap<K, V>.LinkedValueIterator flags:
           $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V> flags:
@@ -624,7 +624,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry<K!, V!>! visibility:public/*package*/ flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedValues modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedValues modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedValues flags:
         superClasses:
           UNBOUND: class AbstractCollection<E : kotlin.Any!> : kotlin.collections.MutableCollection<E!>
@@ -1147,7 +1147,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           UNBOUND: fun toString(): kotlin.String
           FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K!, V!> flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.HashIterator flags:
         superClasses:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -1631,10 +1631,10 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Array<(out) java.util.HashMap.Node<K!, V!>!>! flags:
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p1 index:1 type:kotlin.Int flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:EntryIterator modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:EntryIterator modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.EntryIterator flags:
         superClasses:
-          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
           UNBOUND: interface MutableIterator<out T> : kotlin.collections.Iterator<T>
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public/*package*/ <> ($this:java.util.HashMap<K, V>) returnType:java.util.HashMap<K, V>.EntryIterator flags:
           $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
@@ -1685,7 +1685,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node<K!, V!>! visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node<K!, V!>! visibility:public/*package*/ flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:EntrySet modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:EntrySet modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.EntrySet flags:
         superClasses:
           UNBOUND: class AbstractSet<E : kotlin.Any!> : java.util.AbstractCollection<E!>, kotlin.collections.MutableSet<E!>
@@ -1800,10 +1800,10 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun hugeCapacity(p0: kotlin.Int): kotlin.Int
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Int flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:KeyIterator modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:KeyIterator modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.KeyIterator flags:
         superClasses:
-          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
           UNBOUND: interface MutableIterator<out T> : kotlin.collections.Iterator<T>
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public/*package*/ <> ($this:java.util.HashMap<K, V>) returnType:java.util.HashMap<K, V>.KeyIterator flags:
           $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
@@ -1854,7 +1854,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node<K!, V!>! visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node<K!, V!>! visibility:public/*package*/ flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:KeySet modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:KeySet modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.KeySet flags:
         superClasses:
           UNBOUND: class AbstractSet<E : kotlin.Any!> : java.util.AbstractCollection<E!>, kotlin.collections.MutableSet<E!>
@@ -1969,10 +1969,10 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           overridden:
             UNBOUND: fun hugeCapacity(p0: kotlin.Int): kotlin.Int
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Int flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:ValueIterator modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:ValueIterator modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.ValueIterator flags:
         superClasses:
-          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:
+          CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashIterator modality:ABSTRACT visibility:public/*package*/ flags:inner
           UNBOUND: interface MutableIterator<out T> : kotlin.collections.Iterator<T>
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public/*package*/ <> ($this:java.util.HashMap<K, V>) returnType:java.util.HashMap<K, V>.ValueIterator flags:
           $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
@@ -2023,7 +2023,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node<K!, V!>! visibility:public/*package*/ modality:FINAL flags:var
           FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node<K!, V!>! visibility:public/*package*/ flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Values modality:FINAL visibility:public/*package*/ flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Values modality:FINAL visibility:public/*package*/ flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.Values flags:
         superClasses:
           UNBOUND: class AbstractCollection<E : kotlin.Any!> : kotlin.collections.MutableCollection<E!>
diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt b/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt
index 7d785149c3c..3d491b7d668 100644
--- a/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt
+++ b/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt
@@ -9,7 +9,7 @@ MODULE_FRAGMENT name:<test-module>
         FIELD IR_EXTERNAL_DECLARATION_STUB name:x type:kotlin.Int visibility:public flags:
       FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:OPEN <> ($this:J) returnType:Unit flags:
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:J flags:
-      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:JInner modality:OPEN visibility:public flags:
+      CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:JInner modality:OPEN visibility:public flags:inner
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:J.JInner flags:
         superClasses:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags: