[IR][Tests] Drop phase2 tests of "dump synthetic accessors"

^KT-69941
diff --git a/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArgumentsCopyGenerated.kt b/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArgumentsCopyGenerated.kt
index d352f70..9916142 100644
--- a/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArgumentsCopyGenerated.kt
+++ b/compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArgumentsCopyGenerated.kt
@@ -63,7 +63,6 @@
     to.manifestNativeTargets = from.manifestNativeTargets?.copyOf()
     to.memoryModel = from.memoryModel
     to.moduleName = from.moduleName
-    to.narrowedSyntheticAccessorsVisibility = from.narrowedSyntheticAccessorsVisibility
     to.nativeLibraries = from.nativeLibraries?.copyOf()
     to.noObjcGenerics = from.noObjcGenerics
     to.nodefaultlibs = from.nodefaultlibs
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArguments.kt
index fd61f8b..b277f46 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2NativeCompilerArguments.kt
@@ -464,17 +464,6 @@
             field = if (value.isNullOrEmpty()) null else value
         }
 
-    @Argument(
-        value = "-Xsynthetic-accessors-with-narrowed-visibility",
-        description = "Narrow the visibility of generated synthetic accessors to _internal_" +
-                " if such accessors are only used in inline functions that are not a part of public ABI"
-    )
-    var narrowedSyntheticAccessorsVisibility: Boolean = false
-        set(value) {
-            checkFrozen()
-            field = value
-        }
-
     override fun configureAnalysisFlags(collector: MessageCollector, languageVersion: LanguageVersion): MutableMap<AnalysisFlag<*>, Any> =
         super.configureAnalysisFlags(collector, languageVersion).also {
             val optInList = it[AnalysisFlags.optIn] as List<*>
diff --git a/compiler/config/src/org/jetbrains/kotlin/config/KlibConfigurationKeys.kt b/compiler/config/src/org/jetbrains/kotlin/config/KlibConfigurationKeys.kt
index 260bea3..6339dea 100644
--- a/compiler/config/src/org/jetbrains/kotlin/config/KlibConfigurationKeys.kt
+++ b/compiler/config/src/org/jetbrains/kotlin/config/KlibConfigurationKeys.kt
@@ -31,13 +31,6 @@
         CompilerConfigurationKey.create("Path to a directory to dump synthetic accessors and their use sites")
 
     @JvmField
-    val SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY: CompilerConfigurationKey<Boolean> =
-        CompilerConfigurationKey.create(
-            "Narrow the visibility of generated synthetic accessors to _internal_" +
-                    " if such accessors are only used in inline functions that are not a part of public ABI"
-        )
-
-    @JvmField
     val DUPLICATED_UNIQUE_NAME_STRATEGY: CompilerConfigurationKey<DuplicatedUniqueNameStrategy> =
         CompilerConfigurationKey.create("Duplicated KLIB dependencies handling strategy")
 }
diff --git a/compiler/ir/ir.inline/src/org/jetbrains/kotlin/ir/inline/SyntheticAccessorLowering.kt b/compiler/ir/ir.inline/src/org/jetbrains/kotlin/ir/inline/SyntheticAccessorLowering.kt
index 53def9d..2b897ed 100644
--- a/compiler/ir/ir.inline/src/org/jetbrains/kotlin/ir/inline/SyntheticAccessorLowering.kt
+++ b/compiler/ir/ir.inline/src/org/jetbrains/kotlin/ir/inline/SyntheticAccessorLowering.kt
@@ -35,14 +35,6 @@
  * - By the point it's executed, all _private_ inline functions have already been inlined.
  */
 class SyntheticAccessorLowering(private val context: CommonBackendContext) : FileLoweringPass {
-    /**
-     * Whether the visibility of a generated accessor should be narrowed from _public_ to _internal_ if an accessor is only used
-     * in _internal_ inline functions and therefore is not a part of public ABI.
-     * This "narrowing" is supposed to be used only during the first phase of compilation.
-     */
-    private val narrowAccessorVisibilities =
-        context.configuration.getBoolean(KlibConfigurationKeys.SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY)
-
     private val accessorGenerator = KlibSyntheticAccessorGenerator(context)
 
     override fun lower(irFile: IrFile) {
@@ -51,7 +43,7 @@
 
         val accessors = transformer.generatedAccessors.freezeAndGetAccessors()
         runIf(accessors.isNotEmpty()) {
-            runIf(narrowAccessorVisibilities) { narrowAccessorVisibilities(accessors) }
+            narrowAccessorVisibilities(accessors)
             addAccessorsToParents(accessors)
         }
     }
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt
deleted file mode 100644
index 9462425..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
-    public inner class Inner
-        internal inline fun internalMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateVarThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateVarThroughNestedClass.accessors.txt
deleted file mode 100644
index 9b72065..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateVarThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    public class Nested
-        internal inline fun customVarGetter(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
-        internal inline fun customVarSetter(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClass.accessors.txt
deleted file mode 100644
index 7d41a7c..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    /* TARGET declaration */ private fun privateMethod(): String
-    public inner class Inner
-        internal inline fun internalMethod(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$privateMethod($this = access$<outer-this-0>($this = <this>))
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Outer): String
-        /* TARGET use-site */ $this.privateMethod()
-    /* TARGET declaration */ <this>: Outer
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt
deleted file mode 100644
index a2c0592..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public open class OuterOnlyInternal
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyInternal
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyInternal
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyInternal
-public open class OuterInternalAndPublic
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        public inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndPublic
-public open class OuterInternalAndProtected
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndProtected
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndProtected
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndProtected
-public open class OuterInternalAndInternalPA
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndInternalPA
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndInternalPA
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndInternalPA
-public open class OuterOnlyPublic
-    public open inner class Inner
-        public inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        public inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyPublic
-public open class OuterOnlyProtected
-    public open inner class Inner
-        protected inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyProtected
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyProtected
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyProtected
-public open class OuterOnlyInternalPA
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyInternalPA
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyInternalPA
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyInternalPA
-public open class OuterAllEffectivelyPublic
-    public open inner class Inner
-        public inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo3(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterAllEffectivelyPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterAllEffectivelyPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterAllEffectivelyPublic
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughNestedClass.accessors.txt
deleted file mode 100644
index aff66153..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    /* TARGET declaration */ private fun privateMethod(): String
-    public class Nested
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = Outer())
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Outer): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughInnerClass.accessors.txt
deleted file mode 100644
index 9786e65..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public inner class Inner
-        internal inline fun customVarGetter(): Int
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = access$<outer-this-0>($this = <this>))
-        internal inline fun customVarSetter(value: Int)
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = access$<outer-this-0>($this = <this>), <set-?> = value)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Outer): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Outer, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    /* TARGET declaration */ <this>: Outer
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughNestedClass.accessors.txt
deleted file mode 100644
index 28d1d1c..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public class Nested
-        internal inline fun customVarGetter(outer: Outer): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = outer)
-        internal inline fun customVarSetter(outer: Outer, value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = outer, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Outer): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Outer, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThis.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThis.accessors.txt
deleted file mode 100644
index b774c0e..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThis.accessors.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    private val privatePropertyOfOuter: String
-        /* TARGET declaration */ private fun <get-privatePropertyOfOuter>(): String
-    /* TARGET declaration */ private fun privateFunctionOfOuter(): String
-    public inner class InnerL1
-        public inline fun usesPublicPropertyOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun usesPrivatePropertyOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-0>($this = <this>))
-        public inline fun usesPublicFunctionOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun usesPrivateFunctionOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-0>($this = <this>))
-        private val privatePropertyOfInnerL1: String
-            /* TARGET declaration */ private fun <get-privatePropertyOfInnerL1>(): String
-        /* TARGET declaration */ private fun privateFunctionOfInnerL1(): String
-        public inner class InnerL2
-            public inline fun usesPublicPropertyOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-            internal inline fun usesPrivatePropertyOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-1>($this = <this>))
-            public inline fun usesPublicFunctionOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-            internal inline fun usesPrivateFunctionOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-1>($this = <this>))
-            public inline fun usesPublicPropertyOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            internal inline fun usesPrivatePropertyOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-                /* ACCESSOR use-site */ access$<get-privatePropertyOfInnerL1>($this = access$<outer-this-0>($this = <this>))
-            public inline fun usesPublicFunctionOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            internal inline fun usesPrivateFunctionOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-                /* ACCESSOR use-site */ access$privateFunctionOfInnerL1($this = access$<outer-this-0>($this = <this>))
-            /* ACCESSOR declaration */ private fun <outer-this-0>(): InnerL1
-                /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ private fun <outer-this-1>(): Outer
-                /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL2): InnerL1
-                /* ACCESSOR use-site */ $this.<outer-this-0>()
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-1>($this: InnerL2): Outer
-                /* ACCESSOR use-site */ $this.<outer-this-1>()
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privatePropertyOfInnerL1>($this: InnerL1): String
-            /* TARGET use-site */ $this.<get-privatePropertyOfInnerL1>()
-        /* ACCESSOR declaration */ public /* static */ fun access$privateFunctionOfInnerL1($this: InnerL1): String
-            /* TARGET use-site */ $this.privateFunctionOfInnerL1()
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL1): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-        /* TARGET declaration */ <this>: InnerL1
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privatePropertyOfOuter>($this: Outer): String
-        /* TARGET use-site */ $this.<get-privatePropertyOfOuter>()
-    /* ACCESSOR declaration */ public /* static */ fun access$privateFunctionOfOuter($this: Outer): String
-        /* TARGET use-site */ $this.privateFunctionOfOuter()
-    /* TARGET declaration */ <this>: Outer
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt
deleted file mode 100644
index ff01a68..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
-    public inner class Inner
-        internal inline fun internalMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateVarThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateVarThroughNestedClass.accessors.txt
deleted file mode 100644
index b1d466b..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateVarThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    public class Nested
-        internal inline fun customVarGetter(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
-        internal inline fun customVarSetter(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClass.accessors.txt
deleted file mode 100644
index 25ff9b4..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    /* TARGET declaration */ private fun privateMethod(): String
-    public inner class Inner
-        internal inline fun internalMethod(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$privateMethod($this = access$<outer-this-0>($this = <this>))
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Outer): String
-        /* TARGET use-site */ $this.privateMethod()
-    /* TARGET declaration */ <this>: Outer
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt
deleted file mode 100644
index 7351379..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public open class OuterOnlyInternal
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyInternal
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyInternal
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyInternal
-public open class OuterInternalAndPublic
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        public inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndPublic
-public open class OuterInternalAndProtected
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndProtected
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndProtected
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndProtected
-public open class OuterInternalAndInternalPA
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndInternalPA
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndInternalPA
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndInternalPA
-public open class OuterOnlyPublic
-    public open inner class Inner
-        public inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        public inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyPublic
-public open class OuterOnlyProtected
-    public open inner class Inner
-        protected inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyProtected
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyProtected
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyProtected
-public open class OuterOnlyInternalPA
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyInternalPA
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyInternalPA
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyInternalPA
-public open class OuterAllEffectivelyPublic
-    public open inner class Inner
-        public inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo3(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterAllEffectivelyPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterAllEffectivelyPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterAllEffectivelyPublic
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughNestedClass.accessors.txt
deleted file mode 100644
index 2ed0511..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    /* TARGET declaration */ private fun privateMethod(): String
-    public class Nested
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = Outer())
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Outer): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughInnerClass.accessors.txt
deleted file mode 100644
index 260a845..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public inner class Inner
-        internal inline fun customVarGetter(): Int
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = access$<outer-this-0>($this = <this>))
-        internal inline fun customVarSetter(value: Int)
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = access$<outer-this-0>($this = <this>), <set-?> = value)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Outer): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Outer, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    /* TARGET declaration */ <this>: Outer
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughNestedClass.accessors.txt
deleted file mode 100644
index a9bfa9a..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public class Nested
-        internal inline fun customVarGetter(outer: Outer): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = outer)
-        internal inline fun customVarSetter(outer: Outer, value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = outer, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Outer): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Outer, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThis.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThis.accessors.txt
deleted file mode 100644
index 77c698a..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThis.accessors.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=Outer.kt */
-
-public class Outer
-    private val privatePropertyOfOuter: String
-        /* TARGET declaration */ private fun <get-privatePropertyOfOuter>(): String
-    /* TARGET declaration */ private fun privateFunctionOfOuter(): String
-    public inner class InnerL1
-        public inline fun usesPublicPropertyOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun usesPrivatePropertyOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-0>($this = <this>))
-        public inline fun usesPublicFunctionOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun usesPrivateFunctionOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-0>($this = <this>))
-        private val privatePropertyOfInnerL1: String
-            /* TARGET declaration */ private fun <get-privatePropertyOfInnerL1>(): String
-        /* TARGET declaration */ private fun privateFunctionOfInnerL1(): String
-        public inner class InnerL2
-            public inline fun usesPublicPropertyOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-            internal inline fun usesPrivatePropertyOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-1>($this = <this>))
-            public inline fun usesPublicFunctionOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-            internal inline fun usesPrivateFunctionOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-1>($this = <this>))
-            public inline fun usesPublicPropertyOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            internal inline fun usesPrivatePropertyOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-                /* ACCESSOR use-site */ access$<get-privatePropertyOfInnerL1>($this = access$<outer-this-0>($this = <this>))
-            public inline fun usesPublicFunctionOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            internal inline fun usesPrivateFunctionOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-                /* ACCESSOR use-site */ access$privateFunctionOfInnerL1($this = access$<outer-this-0>($this = <this>))
-            /* ACCESSOR declaration */ private fun <outer-this-0>(): InnerL1
-                /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ private fun <outer-this-1>(): Outer
-                /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL2): InnerL1
-                /* ACCESSOR use-site */ $this.<outer-this-0>()
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-1>($this: InnerL2): Outer
-                /* ACCESSOR use-site */ $this.<outer-this-1>()
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privatePropertyOfInnerL1>($this: InnerL1): String
-            /* TARGET use-site */ $this.<get-privatePropertyOfInnerL1>()
-        /* ACCESSOR declaration */ public /* static */ fun access$privateFunctionOfInnerL1($this: InnerL1): String
-            /* TARGET use-site */ $this.privateFunctionOfInnerL1()
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL1): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-        /* TARGET declaration */ <this>: InnerL1
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privatePropertyOfOuter>($this: Outer): String
-        /* TARGET use-site */ $this.<get-privatePropertyOfOuter>()
-    /* ACCESSOR declaration */ public /* static */ fun access$privateFunctionOfOuter($this: Outer): String
-        /* TARGET use-site */ $this.privateFunctionOfOuter()
-    /* TARGET declaration */ <this>: Outer
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt
deleted file mode 100644
index 535a1ed..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateMethodThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingCompanionPrivateMethodThroughInnerClass.kt */
-
-public class Outer
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
-    public inner class Inner
-        internal inline fun internalMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = Companion)
-public fun box(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateVarThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateVarThroughNestedClass.accessors.txt
deleted file mode 100644
index e424728..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateVarThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingCompanionPrivateVarThroughNestedClass.kt */
-
-public class Outer
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    public class Nested
-        internal inline fun customVarGetter(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
-        internal inline fun customVarSetter(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClass.accessors.txt
deleted file mode 100644
index 0fc7c35..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingOuterPrivateMethodThroughInnerClass.kt */
-
-public class Outer
-    /* TARGET declaration */ private fun privateMethod(): String
-    public inner class Inner
-        internal inline fun internalMethod(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$privateMethod($this = access$<outer-this-0>($this = <this>))
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Outer): String
-        /* TARGET use-site */ $this.privateMethod()
-    /* TARGET declaration */ <this>: Outer
-public fun box(): String
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    /* ACCESSOR use-site */ access$privateMethod($this = access$<outer-this-0>($this = this))
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt
deleted file mode 100644
index d4a5813..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt */
-
-public open class OuterOnlyInternal
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyInternal
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyInternal
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyInternal
-public open class OuterInternalAndPublic
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        public inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndPublic
-public open class OuterInternalAndProtected
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndProtected
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndProtected
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndProtected
-public open class OuterInternalAndInternalPA
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterInternalAndInternalPA
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterInternalAndInternalPA
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterInternalAndInternalPA
-public open class OuterOnlyPublic
-    public open inner class Inner
-        public inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        public inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyPublic
-public open class OuterOnlyProtected
-    public open inner class Inner
-        protected inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyProtected
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyProtected
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyProtected
-public open class OuterOnlyInternalPA
-    public open inner class Inner
-        internal inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterOnlyInternalPA
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterOnlyInternalPA
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterOnlyInternalPA
-public open class OuterAllEffectivelyPublic
-    public open inner class Inner
-        public inline fun inlineFoo1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        protected inline fun inlineFoo2(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun inlineFoo3(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): OuterAllEffectivelyPublic
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): OuterAllEffectivelyPublic
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* TARGET declaration */ <this>: OuterAllEffectivelyPublic
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughNestedClass.accessors.txt
deleted file mode 100644
index 5cc233d..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingOuterPrivateMethodThroughNestedClass.kt */
-
-public class Outer
-    /* TARGET declaration */ private fun privateMethod(): String
-    public class Nested
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = Outer())
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Outer): String
-        /* TARGET use-site */ $this.privateMethod()
-public fun box(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = Outer())
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughInnerClass.accessors.txt
deleted file mode 100644
index 55ccbc2..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughInnerClass.accessors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingOuterPrivateVarThroughInnerClass.kt */
-
-public class Outer
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public inner class Inner
-        internal inline fun customVarGetter(): Int
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = access$<outer-this-0>($this = <this>))
-        internal inline fun customVarSetter(value: Int)
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = access$<outer-this-0>($this = <this>), <set-?> = value)
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: Inner): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Outer): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Outer, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    /* TARGET declaration */ <this>: Outer
-public fun box(): String
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = access$<outer-this-0>($this = this))
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = access$<outer-this-0>($this = this), <set-?> = value)
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = access$<outer-this-0>($this = this))
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughNestedClass.accessors.txt
deleted file mode 100644
index b0b8100..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughNestedClass.accessors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingOuterPrivateVarThroughNestedClass.kt */
-
-public class Outer
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public class Nested
-        internal inline fun customVarGetter(outer: Outer): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = outer)
-        internal inline fun customVarSetter(outer: Outer, value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = outer, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Outer): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Outer, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = outer)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = outer, <set-?> = value)
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = outer)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/outerThisUsage.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/outerThisUsage.accessors.txt
deleted file mode 100644
index 7353d25..0000000
--- a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/outerThisUsage.accessors.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=outerThisUsage.kt */
-
-public class Outer
-    private val privatePropertyOfOuter: String
-        /* TARGET declaration */ private fun <get-privatePropertyOfOuter>(): String
-    /* TARGET declaration */ private fun privateFunctionOfOuter(): String
-    public inner class InnerL1
-        public inline fun usesPublicPropertyOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun usesPrivatePropertyOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-0>($this = <this>))
-        public inline fun usesPublicFunctionOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-        internal inline fun usesPrivateFunctionOfOuterInInnerL1(): String
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-0>($this = <this>))
-        private val privatePropertyOfInnerL1: String
-            /* TARGET declaration */ private fun <get-privatePropertyOfInnerL1>(): String
-        /* TARGET declaration */ private fun privateFunctionOfInnerL1(): String
-        public inner class InnerL2
-            public inline fun usesPublicPropertyOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-            internal inline fun usesPrivatePropertyOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-1>($this = <this>))
-            public inline fun usesPublicFunctionOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-            internal inline fun usesPrivateFunctionOfOuterInInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-1>($this = <this>))
-            public inline fun usesPublicPropertyOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            internal inline fun usesPrivatePropertyOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-                /* ACCESSOR use-site */ access$<get-privatePropertyOfInnerL1>($this = access$<outer-this-0>($this = <this>))
-            public inline fun usesPublicFunctionOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            internal inline fun usesPrivateFunctionOfInnerL1InInnerL2(): String
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-                /* ACCESSOR use-site */ access$privateFunctionOfInnerL1($this = access$<outer-this-0>($this = <this>))
-            /* ACCESSOR declaration */ private fun <outer-this-0>(): InnerL1
-                /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ private fun <outer-this-1>(): Outer
-                /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL2): InnerL1
-                /* ACCESSOR use-site */ $this.<outer-this-0>()
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-1>($this: InnerL2): Outer
-                /* ACCESSOR use-site */ $this.<outer-this-1>()
-        /* ACCESSOR declaration */ private fun <outer-this-0>(): Outer
-            /* TARGET use-site */ <this>
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privatePropertyOfInnerL1>($this: InnerL1): String
-            /* TARGET use-site */ $this.<get-privatePropertyOfInnerL1>()
-        /* ACCESSOR declaration */ public /* static */ fun access$privateFunctionOfInnerL1($this: InnerL1): String
-            /* TARGET use-site */ $this.privateFunctionOfInnerL1()
-        /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL1): Outer
-            /* ACCESSOR use-site */ $this.<outer-this-0>()
-        /* TARGET declaration */ <this>: InnerL1
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privatePropertyOfOuter>($this: Outer): String
-        /* TARGET use-site */ $this.<get-privatePropertyOfOuter>()
-    /* ACCESSOR declaration */ public /* static */ fun access$privateFunctionOfOuter($this: Outer): String
-        /* TARGET use-site */ $this.privateFunctionOfOuter()
-    /* TARGET declaration */ <this>: Outer
-public fun box(): String
-    val usesPublicPropertyOfOuterInInnerL1: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    val usesPrivatePropertyOfOuterInInnerL1: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-        /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-0>($this = this))
-    val usesPublicFunctionOfOuterInInnerL1: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    val usesPrivateFunctionOfOuterInInnerL1: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-        /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-0>($this = this))
-    val usesPublicPropertyOfOuterInInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-1>($this = this)
-    val usesPrivatePropertyOfOuterInInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-1>($this = this)
-        /* ACCESSOR use-site */ access$<get-privatePropertyOfOuter>($this = access$<outer-this-1>($this = this))
-    val usesPublicFunctionOfOuterInInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-1>($this = this)
-    val usesPrivateFunctionOfOuterInInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-1>($this = this)
-        /* ACCESSOR use-site */ access$privateFunctionOfOuter($this = access$<outer-this-1>($this = this))
-    val usesPublicPropertyOfInnerL1InInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    val usesPrivatePropertyOfInnerL1InInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-        /* ACCESSOR use-site */ access$<get-privatePropertyOfInnerL1>($this = access$<outer-this-0>($this = this))
-    val usesPublicFunctionOfInnerL1InInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    val usesPrivateFunctionOfInnerL1InInnerL2: String =
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-        /* ACCESSOR use-site */ access$privateFunctionOfInnerL1($this = access$<outer-this-0>($this = this))
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethod.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethod.accessors.txt
deleted file mode 100644
index bc86a3d..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethod.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        internal inline fun internalInlineCompanionMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.accessors.txt
deleted file mode 100644
index 2e4fff3..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
-internal inline fun internalInlineMethod(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.accessors.txt
deleted file mode 100644
index 1954180..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        internal inline fun customSetVar(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-        internal inline fun customGetVar(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.accessors.txt
deleted file mode 100644
index c99d5f7..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        internal var inlineCompanionVar: Int
-            internal inline fun <get-inlineCompanionVar>(): Int
-                /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-            internal inline fun <set-inlineCompanionVar>(value: Int)
-                /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.accessors.txt
deleted file mode 100644
index 89cfa58..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    internal inline fun customSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
-    internal inline fun customGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.accessors.txt
deleted file mode 100644
index cc4707f..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
deleted file mode 100644
index 7092ba9..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=OK.kt */
-
-public class OK
-    private lateinit var o: String?
-        /* TARGET declaration */ private field o: String?
-        /* TARGET declaration */ private fun <get-o>(): String
-            val tmp: String? = <this>.#o
-                /* TARGET use-site */ <this>.#o
-        /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-            /* TARGET use-site */ <this>.#o = <set-?>
-    public lateinit var k: String?
-        /* TARGET declaration */ private field k: String?
-        public fun <get-k>(): String
-            val tmp: String? = <this>.#k
-                /* TARGET use-site */ <this>.#k
-        public fun <set-k>(<set-?>: String)
-            /* TARGET use-site */ <this>.#k = <set-?>
-    private inline fun doInitializeAndReadOK(): String
-        /* TARGET use-site */ <this>.#o
-        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
-        /* TARGET use-site */ <this>.#o
-        local class <no name provided>
-            public fun run()
-                /* TARGET use-site */ <this>.#k
-                /* TARGET use-site */ <this>.#k
-        /* TARGET use-site */ <this>.<get-o>()
-    internal inline fun initializeAndReadOK(): String
-        /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-        /* ACCESSOR use-site */ access$<set-o>($this = this, <set-?> = "O")
-        /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-        local class <no name provided>
-            public fun run()
-                /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-                /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-        /* ACCESSOR use-site */ access$<get-o>($this = this)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-o>($this: OK): String
-        /* TARGET use-site */ $this.<get-o>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-o>($this: OK, <set-?>: String)
-        /* TARGET use-site */ $this.<set-o>(<set-?> = <set-?>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-o>$p($this: OK): String?
-        /* TARGET use-site */ $this.#o
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-k>$p($this: OK): String?
-        /* TARGET use-site */ $this.#k
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index 3a39550..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private constructor(s: String) /* primary */
-    public constructor()
-        /* TARGET use-site */ A(s = "")
-    internal inline fun copy(s: String): A
-        /* ACCESSOR use-site */ access$<init>(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(s: String): A
-        /* TARGET use-site */ A(s = s)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorWithTypeParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorWithTypeParameter.accessors.txt
deleted file mode 100644
index fe0a468..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorWithTypeParameter.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A<T : Any?>
-    /* TARGET declaration */ private constructor(s: T) /* primary */
-    public constructor()
-        /* TARGET use-site */ A<T>(s = "" as T)
-    internal inline fun copy(s: String): A<String>
-        /* ACCESSOR use-site */ access$<init><String>(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun <T : Any?> access$<init>(s: T): A<T>
-        /* TARGET use-site */ A<T>(s = s)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFun.accessors.txt
deleted file mode 100644
index b3e3718..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFun.accessors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = <this>)
-/* TARGET declaration */ private fun A.privateExtension(): String
-/* ACCESSOR declaration */ public fun access$privateExtension$tAKt($receiver: A): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
deleted file mode 100644
index 7c0dd7e..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun internalInlineExtension(): String
-        /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-/* TARGET declaration */ private fun A.privateExtension(): String
-private inline fun A.privateInlineExtension1(): String
-    /* TARGET use-site */ <this>.privateExtension()
-private inline fun A.privateInlineExtension2(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun A.privateInlineExtension3(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun A.privateInlineExtension4(): String
-    /* TARGET use-site */ this.privateExtension()
-internal fun topLevelFun(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-internal inline fun topLevelInlineFun(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-/* ACCESSOR declaration */ public fun access$privateExtension$tAKt($receiver: A): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionMember.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionMember.accessors.txt
deleted file mode 100644
index fec71ff..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionMember.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun internalInlineMethodA(): Int
-        /* ACCESSOR use-site */ access$privateExtensionMethod($this = <this>, $receiver = 21)
-    internal inline fun internalInlineMethodB(): Int
-        /* ACCESSOR use-site */ access$<get-privateExtensionVar>($this = <this>, $receiver = 21)
-    /* TARGET declaration */ private fun Int.privateExtensionMethod(): Int
-    private val Int.privateExtensionVar: Int
-        /* TARGET declaration */ private fun Int.<get-privateExtensionVar>(): Int
-    /* ACCESSOR declaration */ public /* static */ fun access$privateExtensionMethod($this: A, $receiver: Int): Int
-        /* TARGET use-site */ ($this, $receiver).privateExtensionMethod()
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateExtensionVar>($this: A, $receiver: Int): Int
-        /* TARGET use-site */ ($this, $receiver).<get-privateExtensionVar>()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
deleted file mode 100644
index edc956c..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun customSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tAKt($receiver = <this>, value = value)
-    internal inline fun customGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tAKt($receiver = <this>)
-private var A.privateVar: Int
-    /* TARGET declaration */ private fun A.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun A.<set-privateVar>(value: Int)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt($receiver: A): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt($receiver: A, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index bb16dc0..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>$tAKt($receiver = this)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>$tAKt($receiver = this, value = value)
-private var A.privateVar: Int
-    /* TARGET declaration */ private fun A.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun A.<set-privateVar>(value: Int)
-private var A.privateInlineVar1: Int
-    private inline fun A.<get-privateInlineVar1>(): Int
-        /* TARGET use-site */ <this>.<get-privateVar>()
-    private inline fun A.<set-privateInlineVar1>(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(value = value)
-private var A.privateInlineVar2: Int
-    private inline fun A.<get-privateInlineVar2>(): Int
-        /* TARGET use-site */ this.<get-privateVar>()
-    private inline fun A.<set-privateInlineVar2>(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(value = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt($receiver: A): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt($receiver: A, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethod.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethod.accessors.txt
deleted file mode 100644
index e24c5dc..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethod.accessors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromDefaultArguments.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromDefaultArguments.accessors.txt
deleted file mode 100644
index c016e52..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromDefaultArguments.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public class Foo
-    /* TARGET declaration */ private fun o(): String
-    /* TARGET declaration */ private fun k(): String
-    internal inline fun internalInlineFun(oo: String, kk: Function0<String>): String
-        oo: String
-            /* ACCESSOR use-site */ access$o($this = <this>)
-        kk: Function0<String>
-            local fun <anonymous>(): String
-                /* ACCESSOR use-site */ access$k($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$o($this: Foo): String
-        /* TARGET use-site */ $this.o()
-    /* ACCESSOR declaration */ public /* static */ fun access$k($this: Foo): String
-        /* TARGET use-site */ $this.k()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.accessors.txt
deleted file mode 100644
index 0e089e1..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal val internalInlineVal: Function0<String>
-        internal inline fun <get-internalInlineVal>(): Function0<String>
-            local fun <anonymous>(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.accessors.txt
deleted file mode 100644
index 4ec2431..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(): String
-        local class <no name provided>
-            public fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt
deleted file mode 100644
index 440ffdf..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-        local class <no name provided>
-            public fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClass.accessors.txt
deleted file mode 100644
index d5834cf..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public inner class Inner
-        /* TARGET declaration */ private fun privateMethod(): String
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Inner): String
-            /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.accessors.txt
deleted file mode 100644
index a6f0332..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public inner class Inner
-        /* TARGET declaration */ private fun privateMethod(): Int
-        internal inline fun internalInlineMethod(): Int
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Inner): Int
-            /* TARGET use-site */ $this.privateMethod()
-    internal inline fun internalInlineMethodInOuterClass(): Int
-        /* ACCESSOR use-site */ access$privateMethod($this = <this>.Inner())
-internal inline fun internalInlineMethodOutsideOfOuterClass(): Int
-    /* ACCESSOR use-site */ access$privateMethod($this = A().Inner())
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClass.accessors.txt
deleted file mode 100644
index c33ae12..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public class Nested
-        /* TARGET declaration */ private fun privateMethod(): String
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Nested): String
-            /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.accessors.txt
deleted file mode 100644
index ae0ec66..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public class Nested
-        /* TARGET declaration */ private fun privateMethod(): Int
-        internal inline fun internalInlineMethod(): Int
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Nested): Int
-            /* TARGET use-site */ $this.privateMethod()
-    internal inline fun internalInlineMethodInOuterClass(): Int
-        /* ACCESSOR use-site */ access$privateMethod($this = Nested())
-internal inline fun internalInlineMethodOutsideOfOuterClass(): Int
-    /* ACCESSOR use-site */ access$privateMethod($this = Nested())
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedClass.accessors.txt
deleted file mode 100644
index c304a5c..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public open class Parent
-    /* TARGET declaration */ private fun x(): String
-public class Child : Parent
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$x($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$x($this: Child): String
-        /* TARGET use-site */ super<Parent>.x()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.accessors.txt
deleted file mode 100644
index 4bcb664..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public open class Parent
-    /* TARGET declaration */ private fun x(): String
-public class ChildCompanion
-    internal companion object Companion : Parent
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$x($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$x($this: Companion): String
-            /* TARGET use-site */ super<Parent>.x()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.accessors.txt
deleted file mode 100644
index 53562bf..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    private inline fun privateInlineMethod1(): String
-        /* TARGET use-site */ <this>.privateMethod()
-    private inline fun privateInlineMethod2(): String
-        /* TARGET use-site */ this.privateMethod()
-    private inline fun privateInlineMethod3(): String
-        /* TARGET use-site */ this.privateMethod()
-    private inline fun privateInlineMethod4(): String
-        /* TARGET use-site */ this.privateMethod()
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = this)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
-internal fun topLevelFun(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = this)
-internal inline fun topLevelInlineFun(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodWithDifferentVisibility.accessors.txt
deleted file mode 100644
index 3ecdf00..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public open class A
-    /* TARGET declaration */ private fun onlyInternal(): String
-    /* TARGET declaration */ private fun internalAndPublic(): String
-    /* TARGET declaration */ private fun internalAndProtected(): String
-    /* TARGET declaration */ private fun internalAndInternalPA(): String
-    /* TARGET declaration */ private fun onlyPublic(): String
-    /* TARGET declaration */ private fun onlyProtected(): String
-    /* TARGET declaration */ private fun onlyInternalPA(): String
-    /* TARGET declaration */ private fun allEffectivelyPublic(): String
-    internal inline fun inlineOnlyInternal1(): String
-        /* ACCESSOR use-site */ access$onlyInternal($this = <this>)
-    internal inline fun inlineOnlyInternal2(): String
-        /* ACCESSOR use-site */ access$onlyInternal($this = <this>)
-    internal inline fun inlineInternalAndPublic1(): String
-        /* ACCESSOR use-site */ access$internalAndPublic($this = <this>)
-    public inline fun inlineInternalAndPublic2(): String
-        /* ACCESSOR use-site */ access$internalAndPublic($this = <this>)
-    internal inline fun inlineInternalAndProtected1(): String
-        /* ACCESSOR use-site */ access$internalAndProtected($this = <this>)
-    protected inline fun inlineInternalAndProtected2(): String
-        /* ACCESSOR use-site */ access$internalAndProtected($this = <this>)
-    internal inline fun inlineInternalAndInternalPA1(): String
-        /* ACCESSOR use-site */ access$internalAndInternalPA($this = <this>)
-    internal inline fun inlineInternalAndInternalPA2(): String
-        /* ACCESSOR use-site */ access$internalAndInternalPA($this = <this>)
-    public inline fun inlineOnlyPublic1(): String
-        /* ACCESSOR use-site */ access$onlyPublic($this = <this>)
-    public inline fun inlineOnlyPublic2(): String
-        /* ACCESSOR use-site */ access$onlyPublic($this = <this>)
-    protected inline fun inlineOnlyProtected1(): String
-        /* ACCESSOR use-site */ access$onlyProtected($this = <this>)
-    protected inline fun inlineOnlyProtected2(): String
-        /* ACCESSOR use-site */ access$onlyProtected($this = <this>)
-    internal inline fun inlineOnlyInternalPA1(): String
-        /* ACCESSOR use-site */ access$onlyInternalPA($this = <this>)
-    internal inline fun inlineOnlyInternalPA2(): String
-        /* ACCESSOR use-site */ access$onlyInternalPA($this = <this>)
-    public inline fun inlineAllEffectivelyPublic1(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    protected inline fun inlineAllEffectivelyPublic2(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    internal inline fun inlineAllEffectivelyPublic3(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyInternal($this: A): String
-        /* TARGET use-site */ $this.onlyInternal()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndPublic($this: A): String
-        /* TARGET use-site */ $this.internalAndPublic()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndProtected($this: A): String
-        /* TARGET use-site */ $this.internalAndProtected()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndInternalPA($this: A): String
-        /* TARGET use-site */ $this.internalAndInternalPA()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyPublic($this: A): String
-        /* TARGET use-site */ $this.onlyPublic()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyProtected($this: A): String
-        /* TARGET use-site */ $this.onlyProtected()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyInternalPA($this: A): String
-        /* TARGET use-site */ $this.onlyInternalPA()
-    /* ACCESSOR declaration */ public /* static */ fun access$allEffectivelyPublic($this: A): String
-        /* TARGET use-site */ $this.allEffectivelyPublic()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateOperatorMethod.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateOperatorMethod.accessors.txt
deleted file mode 100644
index 080e680..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateOperatorMethod.accessors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private operator fun plus(increment: Int): String
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$plus($this = <this>, increment = 1)
-    /* ACCESSOR declaration */ public /* static */ fun access$plus($this: A, increment: Int): String
-        /* TARGET use-site */ $this.plus(increment = increment)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineFun.accessors.txt
deleted file mode 100644
index d7485b1..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var a: Int
-        /* TARGET declaration */ private fun <set-a>(<set-?>: Int)
-    public var b: Int
-        /* TARGET declaration */ private fun <set-b>(value: Int)
-    internal inline fun internalInlineSetA()
-        /* ACCESSOR use-site */ access$<set-a>($this = <this>, <set-?> = 42)
-    internal inline fun internalInlineSetB()
-        /* ACCESSOR use-site */ access$<set-b>($this = <this>, value = 21)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-a>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-a>(<set-?> = <set-?>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-b>($this: A, value: Int)
-        /* TARGET use-site */ $this.<set-b>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineVar.accessors.txt
deleted file mode 100644
index 0070ff8..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var privateVar: Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal var inlineVar: Int
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index 8b18a75..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var privateVar: Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    private inline fun privateSetVar1(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private inline fun privateSetVar2(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    internal inline fun internalSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-internal fun topLevelSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-internal inline fun topLevelInlineSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index 99dd749..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var privateVar: Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public var privateInlineVar1: Int
-        private inline fun <set-privateInlineVar1>(value: Int)
-            /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private var privateInlineVar2: Int
-        private inline fun <set-privateInlineVar2>(value: Int)
-            /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    internal var inlineVar: Int
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFun.accessors.txt
deleted file mode 100644
index fab243d..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal inline fun customSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    internal inline fun customGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFunParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFunParameter.accessors.txt
deleted file mode 100644
index 678b6e2..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFunParameter.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private val privateVal: Int
-        /* TARGET declaration */ private fun <get-privateVal>(): Int
-    private val privateValFunctional: Function0<Int>
-        /* TARGET declaration */ private fun <get-privateValFunctional>(): Function0<Int>
-    internal inline fun executor(param: Int): Int
-        param: Int
-            /* ACCESSOR use-site */ access$<get-privateVal>($this = <this>)
-    internal inline fun executorFunctional(noinline block: Function0<Int>): Int
-        noinline block: Function0<Int>
-            /* ACCESSOR use-site */ access$<get-privateValFunctional>($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVal>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVal>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateValFunctional>($this: A): Function0<Int>
-        /* TARGET use-site */ $this.<get-privateValFunctional>()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineVar.accessors.txt
deleted file mode 100644
index 81c49fc..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index da89c5b..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    private inline fun privateSetVar1(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private inline fun privateGetVar1(): Int
-        /* TARGET use-site */ <this>.<get-privateVar>()
-    private inline fun privateSetVar2(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    private inline fun privateGetVar2(): Int
-        /* TARGET use-site */ this.<get-privateVar>()
-    internal inline fun internalSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    internal inline fun internalGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-internal fun topLevelGet(a: A): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-internal fun topLevelSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-internal inline fun topLevelInlineGet(a: A): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-internal inline fun topLevelInlineSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index 91c7ae0..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    private var privateInlineVar1: Int
-        private inline fun <get-privateInlineVar1>(): Int
-            /* TARGET use-site */ <this>.<get-privateVar>()
-        private inline fun <set-privateInlineVar1>(value: Int)
-            /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private var privateInlineVar2: Int
-        private inline fun <get-privateInlineVar2>(): Int
-            /* TARGET use-site */ this.<get-privateVar>()
-        private inline fun <set-privateInlineVar2>(value: Int)
-            /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index e05178a..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private constructor(s: String) /* primary */
-    public constructor()
-        /* TARGET use-site */ A(s = "")
-    /* TARGET declaration */ private constructor(a: String, b: String)
-        /* TARGET use-site */ A(s = a.plus(other = b))
-    /* TARGET declaration */ private constructor(a: Char)
-        /* TARGET use-site */ A(s = a.toString())
-    internal inline fun complexCopy(s: String): A
-        /* ACCESSOR use-site */ access$<init>(s = s)
-        /* ACCESSOR use-site */ access$<init>(a = ' ')
-        /* ACCESSOR use-site */ access$<init>(a = s, b = "")
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(s: String): A
-        /* TARGET use-site */ A(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(a: String, b: String): A
-        /* TARGET use-site */ A(a = a, b = b)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(a: Char): A
-        /* TARGET use-site */ A(a = a)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateConstValFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateConstValFromInternalInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateConstValFromInternalInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateConstValFromInternalInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethod.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethod.accessors.txt
deleted file mode 100644
index 932f7dc..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethod.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        internal inline fun internalInlineCompanionMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.accessors.txt
deleted file mode 100644
index 140fe53..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-internal inline fun internalInlineMethod(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = Companion)
-public class A
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.accessors.txt
deleted file mode 100644
index dda7b91..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        internal inline fun customSetVar(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-        internal inline fun customGetVar(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.accessors.txt
deleted file mode 100644
index a462d32..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        internal var inlineCompanionVar: Int
-            internal inline fun <get-inlineCompanionVar>(): Int
-                /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-            internal inline fun <set-inlineCompanionVar>(value: Int)
-                /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.accessors.txt
deleted file mode 100644
index 3a93f32..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    internal inline fun customSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
-    internal inline fun customGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.accessors.txt
deleted file mode 100644
index 36f9f50e..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public companion object Companion
-        private var privateVar: Int
-            /* TARGET declaration */ private fun <get-privateVar>(): Int
-            /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-        /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: Companion): Int
-            /* TARGET use-site */ $this.<get-privateVar>()
-        /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: Companion, <set-?>: Int)
-            /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = Companion)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = Companion, <set-?> = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
deleted file mode 100644
index 6f7de25..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=OK.kt */
-
-public class OK
-    private lateinit var o: String?
-        /* TARGET declaration */ private field o: String?
-        /* TARGET declaration */ private fun <get-o>(): String
-            val tmp: String? = <this>.#o
-                /* TARGET use-site */ <this>.#o
-        /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-            /* TARGET use-site */ <this>.#o = <set-?>
-    public lateinit var k: String?
-        /* TARGET declaration */ private field k: String?
-        public fun <get-k>(): String
-            val tmp: String? = <this>.#k
-                /* TARGET use-site */ <this>.#k
-        public fun <set-k>(<set-?>: String)
-            /* TARGET use-site */ <this>.#k = <set-?>
-    private inline fun doInitializeAndReadOK(): String
-        /* TARGET use-site */ <this>.#o
-        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
-        /* TARGET use-site */ <this>.#o
-        local class <no name provided>
-            public fun run()
-                /* TARGET use-site */ <this>.#k
-                /* TARGET use-site */ <this>.#k
-        /* TARGET use-site */ <this>.<get-o>()
-    internal inline fun initializeAndReadOK(): String
-        /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-        /* ACCESSOR use-site */ access$<set-o>($this = this, <set-?> = "O")
-        /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-        local class <no name provided>
-            public fun run()
-                /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-                /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-        /* ACCESSOR use-site */ access$<get-o>($this = this)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-o>($this: OK): String
-        /* TARGET use-site */ $this.<get-o>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-o>($this: OK, <set-?>: String)
-        /* TARGET use-site */ $this.<set-o>(<set-?> = <set-?>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-o>$p($this: OK): String?
-        /* TARGET use-site */ $this.#o
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-k>$p($this: OK): String?
-        /* TARGET use-site */ $this.#k
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index d452ae7..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private constructor(s: String) /* primary */
-    public constructor()
-        /* TARGET use-site */ A(s = "")
-    internal inline fun copy(s: String): A
-        /* ACCESSOR use-site */ access$<init>(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(s: String): A
-        /* TARGET use-site */ A(s = s)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorWithTypeParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorWithTypeParameter.accessors.txt
deleted file mode 100644
index 313b176..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorWithTypeParameter.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A<T : Any?>
-    /* TARGET declaration */ private constructor(s: T) /* primary */
-    public constructor()
-        /* TARGET use-site */ A<T>(s = "" as T)
-    internal inline fun copy(s: String): A<String>
-        /* ACCESSOR use-site */ access$<init><String>(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun <T : Any?> access$<init>(s: T): A<T>
-        /* TARGET use-site */ A<T>(s = s)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFun.accessors.txt
deleted file mode 100644
index d1b2ca1..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFun.accessors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = <this>)
-/* TARGET declaration */ private fun A.privateExtension(): String
-/* ACCESSOR declaration */ public fun access$privateExtension$tAKt($receiver: A): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
deleted file mode 100644
index 8f3c73d..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun internalInlineExtension(): String
-        /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-internal fun topLevelFun(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-internal inline fun topLevelInlineFun(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-private inline fun A.privateInlineExtension4(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun A.privateInlineExtension3(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun A.privateInlineExtension2(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun A.privateInlineExtension1(): String
-    /* TARGET use-site */ <this>.privateExtension()
-/* TARGET declaration */ private fun A.privateExtension(): String
-/* ACCESSOR declaration */ public fun access$privateExtension$tAKt($receiver: A): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionMember.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionMember.accessors.txt
deleted file mode 100644
index 28eb1a7..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionMember.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun internalInlineMethodA(): Int
-        /* ACCESSOR use-site */ access$privateExtensionMethod($this = <this>, $receiver = 21)
-    internal inline fun internalInlineMethodB(): Int
-        /* ACCESSOR use-site */ access$<get-privateExtensionVar>($this = <this>, $receiver = 21)
-    /* TARGET declaration */ private fun Int.privateExtensionMethod(): Int
-    private val Int.privateExtensionVar: Int
-        /* TARGET declaration */ private fun Int.<get-privateExtensionVar>(): Int
-    /* ACCESSOR declaration */ public /* static */ fun access$privateExtensionMethod($this: A, $receiver: Int): Int
-        /* TARGET use-site */ ($this, $receiver).privateExtensionMethod()
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateExtensionVar>($this: A, $receiver: Int): Int
-        /* TARGET use-site */ ($this, $receiver).<get-privateExtensionVar>()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
deleted file mode 100644
index 7f9112f..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun customSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tAKt($receiver = <this>, value = value)
-    internal inline fun customGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tAKt($receiver = <this>)
-private var A.privateVar: Int
-    /* TARGET declaration */ private fun A.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun A.<set-privateVar>(value: Int)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt($receiver: A): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt($receiver: A, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index 6278765..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>$tAKt($receiver = this)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>$tAKt($receiver = this, value = value)
-private var A.privateInlineVar2: Int
-    private inline fun A.<get-privateInlineVar2>(): Int
-        /* TARGET use-site */ this.<get-privateVar>()
-    private inline fun A.<set-privateInlineVar2>(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(value = value)
-private var A.privateInlineVar1: Int
-    private inline fun A.<get-privateInlineVar1>(): Int
-        /* TARGET use-site */ <this>.<get-privateVar>()
-    private inline fun A.<set-privateInlineVar1>(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(value = value)
-private var A.privateVar: Int
-    /* TARGET declaration */ private fun A.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun A.<set-privateVar>(value: Int)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt($receiver: A): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt($receiver: A, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethod.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethod.accessors.txt
deleted file mode 100644
index 33c86bd..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethod.accessors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromDefaultArguments.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromDefaultArguments.accessors.txt
deleted file mode 100644
index 80e0db5..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromDefaultArguments.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public class Foo
-    /* TARGET declaration */ private fun o(): String
-    /* TARGET declaration */ private fun k(): String
-    internal inline fun internalInlineFun(oo: String, kk: Function0<String>): String
-        oo: String
-            /* ACCESSOR use-site */ access$o($this = <this>)
-        kk: Function0<String>
-            local fun <anonymous>(): String
-                /* ACCESSOR use-site */ access$k($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$o($this: Foo): String
-        /* TARGET use-site */ $this.o()
-    /* ACCESSOR declaration */ public /* static */ fun access$k($this: Foo): String
-        /* TARGET use-site */ $this.k()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.accessors.txt
deleted file mode 100644
index aea1df3..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal val internalInlineVal: Function0<String>
-        internal inline fun <get-internalInlineVal>(): Function0<String>
-            local fun <anonymous>(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.accessors.txt
deleted file mode 100644
index bd4150d..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(): String
-        local class <no name provided>
-            public fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt
deleted file mode 100644
index f927ca6..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-        local class <no name provided>
-            public fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClass.accessors.txt
deleted file mode 100644
index 4b5a2dc..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public inner class Inner
-        /* TARGET declaration */ private fun privateMethod(): String
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Inner): String
-            /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.accessors.txt
deleted file mode 100644
index 437596c..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public inner class Inner
-        /* TARGET declaration */ private fun privateMethod(): Int
-        internal inline fun internalInlineMethod(): Int
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Inner): Int
-            /* TARGET use-site */ $this.privateMethod()
-    internal inline fun internalInlineMethodInOuterClass(): Int
-        /* ACCESSOR use-site */ access$privateMethod($this = <this>.Inner())
-internal inline fun internalInlineMethodOutsideOfOuterClass(): Int
-    /* ACCESSOR use-site */ access$privateMethod($this = A().Inner())
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClass.accessors.txt
deleted file mode 100644
index ec7038d..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public class Nested
-        /* TARGET declaration */ private fun privateMethod(): String
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Nested): String
-            /* TARGET use-site */ $this.privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.accessors.txt
deleted file mode 100644
index 686f09e..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public class Nested
-        /* TARGET declaration */ private fun privateMethod(): Int
-        internal inline fun internalInlineMethod(): Int
-            /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Nested): Int
-            /* TARGET use-site */ $this.privateMethod()
-    internal inline fun internalInlineMethodInOuterClass(): Int
-        /* ACCESSOR use-site */ access$privateMethod($this = Nested())
-internal inline fun internalInlineMethodOutsideOfOuterClass(): Int
-    /* ACCESSOR use-site */ access$privateMethod($this = Nested())
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedClass.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedClass.accessors.txt
deleted file mode 100644
index c24bcb7..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedClass.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class Child : Parent
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$x($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$x($this: Child): String
-        /* TARGET use-site */ super<Parent>.x()
-public open class Parent
-    /* TARGET declaration */ private fun x(): String
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.accessors.txt
deleted file mode 100644
index 2813ddf..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class ChildCompanion
-    internal companion object Companion : Parent
-        internal inline fun internalInlineMethod(): String
-            /* ACCESSOR use-site */ access$x($this = <this>)
-        /* ACCESSOR declaration */ public /* static */ fun access$x($this: Companion): String
-            /* TARGET use-site */ super<Parent>.x()
-public open class Parent
-    /* TARGET declaration */ private fun x(): String
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.accessors.txt
deleted file mode 100644
index 4b48845..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    private inline fun privateInlineMethod1(): String
-        /* TARGET use-site */ <this>.privateMethod()
-    private inline fun privateInlineMethod2(): String
-        /* TARGET use-site */ this.privateMethod()
-    private inline fun privateInlineMethod3(): String
-        /* TARGET use-site */ this.privateMethod()
-    private inline fun privateInlineMethod4(): String
-        /* TARGET use-site */ this.privateMethod()
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = this)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
-internal fun topLevelFun(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = this)
-internal inline fun topLevelInlineFun(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodWithDifferentVisibility.accessors.txt
deleted file mode 100644
index 6680546b..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public open class A
-    /* TARGET declaration */ private fun onlyInternal(): String
-    /* TARGET declaration */ private fun internalAndPublic(): String
-    /* TARGET declaration */ private fun internalAndProtected(): String
-    /* TARGET declaration */ private fun internalAndInternalPA(): String
-    /* TARGET declaration */ private fun onlyPublic(): String
-    /* TARGET declaration */ private fun onlyProtected(): String
-    /* TARGET declaration */ private fun onlyInternalPA(): String
-    /* TARGET declaration */ private fun allEffectivelyPublic(): String
-    internal inline fun inlineOnlyInternal1(): String
-        /* ACCESSOR use-site */ access$onlyInternal($this = <this>)
-    internal inline fun inlineOnlyInternal2(): String
-        /* ACCESSOR use-site */ access$onlyInternal($this = <this>)
-    internal inline fun inlineInternalAndPublic1(): String
-        /* ACCESSOR use-site */ access$internalAndPublic($this = <this>)
-    public inline fun inlineInternalAndPublic2(): String
-        /* ACCESSOR use-site */ access$internalAndPublic($this = <this>)
-    internal inline fun inlineInternalAndProtected1(): String
-        /* ACCESSOR use-site */ access$internalAndProtected($this = <this>)
-    protected inline fun inlineInternalAndProtected2(): String
-        /* ACCESSOR use-site */ access$internalAndProtected($this = <this>)
-    internal inline fun inlineInternalAndInternalPA1(): String
-        /* ACCESSOR use-site */ access$internalAndInternalPA($this = <this>)
-    internal inline fun inlineInternalAndInternalPA2(): String
-        /* ACCESSOR use-site */ access$internalAndInternalPA($this = <this>)
-    public inline fun inlineOnlyPublic1(): String
-        /* ACCESSOR use-site */ access$onlyPublic($this = <this>)
-    public inline fun inlineOnlyPublic2(): String
-        /* ACCESSOR use-site */ access$onlyPublic($this = <this>)
-    protected inline fun inlineOnlyProtected1(): String
-        /* ACCESSOR use-site */ access$onlyProtected($this = <this>)
-    protected inline fun inlineOnlyProtected2(): String
-        /* ACCESSOR use-site */ access$onlyProtected($this = <this>)
-    internal inline fun inlineOnlyInternalPA1(): String
-        /* ACCESSOR use-site */ access$onlyInternalPA($this = <this>)
-    internal inline fun inlineOnlyInternalPA2(): String
-        /* ACCESSOR use-site */ access$onlyInternalPA($this = <this>)
-    public inline fun inlineAllEffectivelyPublic1(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    protected inline fun inlineAllEffectivelyPublic2(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    internal inline fun inlineAllEffectivelyPublic3(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyInternal($this: A): String
-        /* TARGET use-site */ $this.onlyInternal()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndPublic($this: A): String
-        /* TARGET use-site */ $this.internalAndPublic()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndProtected($this: A): String
-        /* TARGET use-site */ $this.internalAndProtected()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndInternalPA($this: A): String
-        /* TARGET use-site */ $this.internalAndInternalPA()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyPublic($this: A): String
-        /* TARGET use-site */ $this.onlyPublic()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyProtected($this: A): String
-        /* TARGET use-site */ $this.onlyProtected()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyInternalPA($this: A): String
-        /* TARGET use-site */ $this.onlyInternalPA()
-    /* ACCESSOR declaration */ public /* static */ fun access$allEffectivelyPublic($this: A): String
-        /* TARGET use-site */ $this.allEffectivelyPublic()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateOperatorMethod.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateOperatorMethod.accessors.txt
deleted file mode 100644
index 78ad2cb..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateOperatorMethod.accessors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private operator fun plus(increment: Int): String
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$plus($this = <this>, increment = 1)
-    /* ACCESSOR declaration */ public /* static */ fun access$plus($this: A, increment: Int): String
-        /* TARGET use-site */ $this.plus(increment = increment)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineFun.accessors.txt
deleted file mode 100644
index bc95ecc..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var a: Int
-        /* TARGET declaration */ private fun <set-a>(<set-?>: Int)
-    public var b: Int
-        /* TARGET declaration */ private fun <set-b>(value: Int)
-    internal inline fun internalInlineSetA()
-        /* ACCESSOR use-site */ access$<set-a>($this = <this>, <set-?> = 42)
-    internal inline fun internalInlineSetB()
-        /* ACCESSOR use-site */ access$<set-b>($this = <this>, value = 21)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-a>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-a>(<set-?> = <set-?>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-b>($this: A, value: Int)
-        /* TARGET use-site */ $this.<set-b>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineVar.accessors.txt
deleted file mode 100644
index d312874..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var privateVar: Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal var inlineVar: Int
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index c78ad94..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var privateVar: Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    private inline fun privateSetVar1(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private inline fun privateSetVar2(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    internal inline fun internalSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-internal fun topLevelSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-internal inline fun topLevelInlineSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index b76c430..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    public var privateVar: Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    public var privateInlineVar1: Int
-        private inline fun <set-privateInlineVar1>(value: Int)
-            /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private var privateInlineVar2: Int
-        private inline fun <set-privateInlineVar2>(value: Int)
-            /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    internal var inlineVar: Int
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFun.accessors.txt
deleted file mode 100644
index 2891084..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal inline fun customSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    internal inline fun customGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFunParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFunParameter.accessors.txt
deleted file mode 100644
index 9c0f10d..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFunParameter.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private val privateVal: Int
-        /* TARGET declaration */ private fun <get-privateVal>(): Int
-    private val privateValFunctional: Function0<Int>
-        /* TARGET declaration */ private fun <get-privateValFunctional>(): Function0<Int>
-    internal inline fun executor(param: Int): Int
-        param: Int
-            /* ACCESSOR use-site */ access$<get-privateVal>($this = <this>)
-    internal inline fun executorFunctional(noinline block: Function0<Int>): Int
-        noinline block: Function0<Int>
-            /* ACCESSOR use-site */ access$<get-privateValFunctional>($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVal>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVal>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateValFunctional>($this: A): Function0<Int>
-        /* TARGET use-site */ $this.<get-privateValFunctional>()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineVar.accessors.txt
deleted file mode 100644
index f98f8fc..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index 3b938d4..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    private inline fun privateSetVar1(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private inline fun privateGetVar1(): Int
-        /* TARGET use-site */ <this>.<get-privateVar>()
-    private inline fun privateSetVar2(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    private inline fun privateGetVar2(): Int
-        /* TARGET use-site */ this.<get-privateVar>()
-    internal inline fun internalSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    internal inline fun internalGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-internal fun topLevelSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-internal fun topLevelGet(a: A): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-internal inline fun topLevelInlineSet(a: A, value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-internal inline fun topLevelInlineGet(a: A): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index 9dd15bd..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    private var privateInlineVar1: Int
-        private inline fun <get-privateInlineVar1>(): Int
-            /* TARGET use-site */ <this>.<get-privateVar>()
-        private inline fun <set-privateInlineVar1>(value: Int)
-            /* TARGET use-site */ <this>.<set-privateVar>(<set-?> = value)
-    private var privateInlineVar2: Int
-        private inline fun <get-privateInlineVar2>(): Int
-            /* TARGET use-site */ this.<get-privateVar>()
-        private inline fun <set-privateInlineVar2>(value: Int)
-            /* TARGET use-site */ this.<set-privateVar>(<set-?> = value)
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index 6899d10..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    /* TARGET declaration */ private constructor(s: String) /* primary */
-    public constructor()
-        /* TARGET use-site */ A(s = "")
-    /* TARGET declaration */ private constructor(a: String, b: String)
-        /* TARGET use-site */ A(s = a.plus(other = b))
-    /* TARGET declaration */ private constructor(a: Char)
-        /* TARGET use-site */ A(s = a.toString())
-    internal inline fun complexCopy(s: String): A
-        /* ACCESSOR use-site */ access$<init>(s = s)
-        /* ACCESSOR use-site */ access$<init>(a = ' ')
-        /* ACCESSOR use-site */ access$<init>(a = s, b = "")
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(s: String): A
-        /* TARGET use-site */ A(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(a: String, b: String): A
-        /* TARGET use-site */ A(a = a, b = b)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(a: Char): A
-        /* TARGET use-site */ A(a = a)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateConstValFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateConstValFromInternalInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateConstValFromInternalInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateConstValFromInternalInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughEffectivelyInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughEffectivelyInternalInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughEffectivelyInternalInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughEffectivelyInternalInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodWithDifferentVisibility.accessors.txt
deleted file mode 100644
index db72a02..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingPrivateMethodWithDifferentVisibility.kt */
-
-public open class A
-    /* TARGET declaration */ private fun onlyInternal(): String
-    /* TARGET declaration */ private fun internalAndPublic(): String
-    /* TARGET declaration */ private fun internalAndProtected(): String
-    /* TARGET declaration */ private fun internalAndInternalPA(): String
-    /* TARGET declaration */ private fun onlyPublic(): String
-    /* TARGET declaration */ private fun onlyProtected(): String
-    /* TARGET declaration */ private fun onlyInternalPA(): String
-    /* TARGET declaration */ private fun allEffectivelyPublic(): String
-    internal inline fun inlineOnlyInternal1(): String
-        /* ACCESSOR use-site */ access$onlyInternal($this = <this>)
-    internal inline fun inlineOnlyInternal2(): String
-        /* ACCESSOR use-site */ access$onlyInternal($this = <this>)
-    internal inline fun inlineInternalAndPublic1(): String
-        /* ACCESSOR use-site */ access$internalAndPublic($this = <this>)
-    public inline fun inlineInternalAndPublic2(): String
-        /* ACCESSOR use-site */ access$internalAndPublic($this = <this>)
-    internal inline fun inlineInternalAndProtected1(): String
-        /* ACCESSOR use-site */ access$internalAndProtected($this = <this>)
-    protected inline fun inlineInternalAndProtected2(): String
-        /* ACCESSOR use-site */ access$internalAndProtected($this = <this>)
-    internal inline fun inlineInternalAndInternalPA1(): String
-        /* ACCESSOR use-site */ access$internalAndInternalPA($this = <this>)
-    internal inline fun inlineInternalAndInternalPA2(): String
-        /* ACCESSOR use-site */ access$internalAndInternalPA($this = <this>)
-    public inline fun inlineOnlyPublic1(): String
-        /* ACCESSOR use-site */ access$onlyPublic($this = <this>)
-    public inline fun inlineOnlyPublic2(): String
-        /* ACCESSOR use-site */ access$onlyPublic($this = <this>)
-    protected inline fun inlineOnlyProtected1(): String
-        /* ACCESSOR use-site */ access$onlyProtected($this = <this>)
-    protected inline fun inlineOnlyProtected2(): String
-        /* ACCESSOR use-site */ access$onlyProtected($this = <this>)
-    internal inline fun inlineOnlyInternalPA1(): String
-        /* ACCESSOR use-site */ access$onlyInternalPA($this = <this>)
-    internal inline fun inlineOnlyInternalPA2(): String
-        /* ACCESSOR use-site */ access$onlyInternalPA($this = <this>)
-    public inline fun inlineAllEffectivelyPublic1(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    protected inline fun inlineAllEffectivelyPublic2(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    internal inline fun inlineAllEffectivelyPublic3(): String
-        /* ACCESSOR use-site */ access$allEffectivelyPublic($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyInternal($this: A): String
-        /* TARGET use-site */ $this.onlyInternal()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndPublic($this: A): String
-        /* TARGET use-site */ $this.internalAndPublic()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndProtected($this: A): String
-        /* TARGET use-site */ $this.internalAndProtected()
-    /* ACCESSOR declaration */ public /* static */ fun access$internalAndInternalPA($this: A): String
-        /* TARGET use-site */ $this.internalAndInternalPA()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyPublic($this: A): String
-        /* TARGET use-site */ $this.onlyPublic()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyProtected($this: A): String
-        /* TARGET use-site */ $this.onlyProtected()
-    /* ACCESSOR declaration */ public /* static */ fun access$onlyInternalPA($this: A): String
-        /* TARGET use-site */ $this.onlyInternalPA()
-    /* ACCESSOR declaration */ public /* static */ fun access$allEffectivelyPublic($this: A): String
-        /* TARGET use-site */ $this.allEffectivelyPublic()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useCompanionPrivateMethodFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useCompanionPrivateMethodFromInternalInline.accessors.txt
deleted file mode 100644
index 9ec8294..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useCompanionPrivateMethodFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=useCompanionPrivateMethodFromInternalInline.kt */
-
-public class A
-    public companion object Companion
-        /* TARGET declaration */ private fun privateMethod(): String
-        /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: Companion): String
-            /* TARGET use-site */ $this.privateMethod()
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = Companion)
-public fun box(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = Companion)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt
deleted file mode 100644
index c9bcf68..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=useLateinitIsInitializedFromInternalInline.kt */
-
-public class OK
-    private lateinit var o: String?
-        /* TARGET declaration */ private field o: String?
-        /* TARGET declaration */ private fun <get-o>(): String
-            val tmp: String? = <this>.#o
-                /* TARGET use-site */ <this>.#o
-        /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-            /* TARGET use-site */ <this>.#o = <set-?>
-    public lateinit var k: String?
-        /* TARGET declaration */ private field k: String?
-        public fun <get-k>(): String
-            val tmp: String? = <this>.#k
-                /* TARGET use-site */ <this>.#k
-        public fun <set-k>(<set-?>: String)
-            /* TARGET use-site */ <this>.#k = <set-?>
-    private inline fun doInitializeAndReadOK(): String
-        /* TARGET use-site */ <this>.#o
-        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
-        /* TARGET use-site */ <this>.#o
-        local class <no name provided>
-            public fun run()
-                /* TARGET use-site */ <this>.#k
-                /* TARGET use-site */ <this>.#k
-        /* TARGET use-site */ <this>.<get-o>()
-    internal inline fun initializeAndReadOK(): String
-        /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-        /* ACCESSOR use-site */ access$<set-o>($this = this, <set-?> = "O")
-        /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-        local class <no name provided>
-            public fun run()
-                /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-                /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-        /* ACCESSOR use-site */ access$<get-o>($this = this)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-o>($this: OK): String
-        /* TARGET use-site */ $this.<get-o>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-o>($this: OK, <set-?>: String)
-        /* TARGET use-site */ $this.<set-o>(<set-?> = <set-?>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-o>$p($this: OK): String?
-        /* TARGET use-site */ $this.#o
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-k>$p($this: OK): String?
-        /* TARGET use-site */ $this.#k
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-    /* ACCESSOR use-site */ access$<set-o>($this = this, <set-?> = "O")
-    /* ACCESSOR use-site */ access$<get-o>$p($this = this)
-    local class <no name provided>
-        public fun run()
-            /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-            /* ACCESSOR use-site */ access$<get-k>$p($this = this)
-    /* ACCESSOR use-site */ access$<get-o>($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateClassConstructor.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateClassConstructor.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateClassConstructor.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateClassConstructor.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateClassConstructor.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateCompanionThroughInternalInlineFun.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateCompanionThroughInternalInlineFun.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateCompanionThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateCompanionThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateCompanionThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorFromInternalInline.accessors.txt
deleted file mode 100644
index d385691..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateConstructorFromInternalInline.kt */
-
-public class A
-    /* TARGET declaration */ private constructor(s: String) /* primary */
-    public constructor()
-        /* TARGET use-site */ A(s = "")
-    internal inline fun copy(s: String): A
-        /* ACCESSOR use-site */ access$<init>(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(s: String): A
-        /* TARGET use-site */ A(s = s)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<init>(s = s)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorWithTypeParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorWithTypeParameter.accessors.txt
deleted file mode 100644
index edb6848..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorWithTypeParameter.accessors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateConstructorWithTypeParameter.kt */
-
-public class A<T : Any?>
-    /* TARGET declaration */ private constructor(s: T) /* primary */
-    public constructor()
-        /* TARGET use-site */ A<T>(s = "" as T)
-    internal inline fun copy(s: String): A<String>
-        /* ACCESSOR use-site */ access$<init><String>(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun <T : Any?> access$<init>(s: T): A<T>
-        /* TARGET use-site */ A<T>(s = s)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<init><String>(s = s)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateExtensionFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateExtensionFromInternalInline.accessors.txt
deleted file mode 100644
index aebc6d7..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateExtensionFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateExtensionFromInternalInline.kt */
-
-public class A
-    internal inline fun internalInlineMethodA(): Int
-        /* ACCESSOR use-site */ access$privateExtension$tUsePrivateExtensionFromInternalInlineKt($receiver = <this>)
-    internal inline fun internalInlineMethodB(): Int
-        /* ACCESSOR use-site */ access$<get-privateExtensionVar>($this = <this>, $receiver = 21)
-    private val Int.privateExtensionVar: Int
-        /* TARGET declaration */ private fun Int.<get-privateExtensionVar>(): Int
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateExtensionVar>($this: A, $receiver: Int): Int
-        /* TARGET use-site */ ($this, $receiver).<get-privateExtensionVar>()
-/* TARGET declaration */ private fun A.privateExtension(): Int
-public fun box(): String
-    /* ACCESSOR use-site */ access$privateExtension$tUsePrivateExtensionFromInternalInlineKt($receiver = this)
-    /* ACCESSOR use-site */ access$<get-privateExtensionVar>($this = this, $receiver = 21)
-/* ACCESSOR declaration */ public fun access$privateExtension$tUsePrivateExtensionFromInternalInlineKt($receiver: A): Int
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateFunInterfaceFromInternalFun.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateFunInterfaceFromInternalFun.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateFunInterfaceFromInternalFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateFunInterfaceFromInternalFun.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateFunInterfaceFromInternalFun.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateInnerClassThroughInternalInlineFun.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateInnerClassThroughInternalInlineFun.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateInnerClassThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateInnerClassThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateInnerClassThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromDefaultArguments.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromDefaultArguments.accessors.txt
deleted file mode 100644
index cdb4a10..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromDefaultArguments.accessors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateMethodFromDefaultArguments.kt */
-
-public class Foo
-    /* TARGET declaration */ private fun o(): String
-    /* TARGET declaration */ private fun k(): String
-    internal inline fun internalInlineFun(oo: String, kk: Function0<String>): String
-        oo: String
-            /* ACCESSOR use-site */ access$o($this = <this>)
-        kk: Function0<String>
-            local fun <anonymous>(): String
-                /* ACCESSOR use-site */ access$k($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$o($this: Foo): String
-        /* TARGET use-site */ $this.o()
-    /* ACCESSOR declaration */ public /* static */ fun access$k($this: Foo): String
-        /* TARGET use-site */ $this.k()
-public fun box(): String
-    val oo: String =
-        /* ACCESSOR use-site */ access$o($this = tmp0)
-    /* ACCESSOR use-site */ access$k($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromInternalInline.accessors.txt
deleted file mode 100644
index e8561d1..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateMethodFromInternalInline.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
-public fun box(): String
-    /* ACCESSOR use-site */ access$privateMethod($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectInsideInternalInline.accessors.txt
deleted file mode 100644
index 503e453..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateMethodFromLocalObjectInsideInternalInline.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(): String
-        local class <no name provided>
-            public fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
-public fun box(): String
-    local class <no name provided>
-        public fun run(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt
deleted file mode 100644
index b560cb7..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt */
-
-public class A
-    /* TARGET declaration */ private fun privateMethod(): String
-    internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-        local class <no name provided>
-            public fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$privateMethod($this: A): String
-        /* TARGET use-site */ $this.privateMethod()
-public fun box(): String
-    local class <no name provided>
-        public fun run(): String
-            /* ACCESSOR use-site */ access$privateMethod($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateNestedClassThroughInternalInlineFun.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateNestedClassThroughInternalInlineFun.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateNestedClassThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateNestedClassThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateNestedClassThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateOperatorMethod.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateOperatorMethod.accessors.txt
deleted file mode 100644
index 3ecdd67..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateOperatorMethod.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateOperatorMethod.kt */
-
-public class A
-    /* TARGET declaration */ private operator fun plus(increment: Int): String
-    internal inline fun internalInlineMethod(): String
-        /* ACCESSOR use-site */ access$plus($this = <this>, increment = 1)
-    /* ACCESSOR declaration */ public /* static */ fun access$plus($this: A, increment: Int): String
-        /* TARGET use-site */ $this.plus(increment = increment)
-public fun box(): String
-    /* ACCESSOR use-site */ access$plus($this = this, increment = 1)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineFun.accessors.txt
deleted file mode 100644
index da9348ed..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateSetterFromInternalInlineFun.kt */
-
-public class A
-    public var privateSetterVarA: Int
-        /* TARGET declaration */ private fun <set-privateSetterVarA>(<set-?>: Int)
-    public var privateSetterVarB: Int
-        /* TARGET declaration */ private fun <set-privateSetterVarB>(value: Int)
-    internal inline fun customSetVarA(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateSetterVarA>($this = <this>, <set-?> = value)
-    internal inline fun customSetVarB(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateSetterVarB>($this = <this>, value = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateSetterVarA>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateSetterVarA>(<set-?> = <set-?>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateSetterVarB>($this: A, value: Int)
-        /* TARGET use-site */ $this.<set-privateSetterVarB>(value = value)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<set-privateSetterVarA>($this = this, <set-?> = value)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarB>($this = this, value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineVar.accessors.txt
deleted file mode 100644
index af51fed..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineVar.accessors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateSetterFromInternalInlineVar.kt */
-
-public class A
-    public var privateSetterVarA: Int
-        /* TARGET declaration */ private fun <set-privateSetterVarA>(<set-?>: Int)
-    public var privateSetterVarB: Int
-        /* TARGET declaration */ private fun <set-privateSetterVarB>(value: Int)
-    internal var inlineVarA: Int
-        internal inline fun <set-inlineVarA>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateSetterVarA>($this = <this>, <set-?> = value)
-    internal var inlineVarB: Int
-        internal inline fun <set-inlineVarB>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateSetterVarB>($this = <this>, value = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateSetterVarA>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateSetterVarA>(<set-?> = <set-?>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateSetterVarB>($this: A, value: Int)
-        /* TARGET use-site */ $this.<set-privateSetterVarB>(value = value)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<set-privateSetterVarA>($this = this, <set-?> = value)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarB>($this = this, value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineFun.accessors.txt
deleted file mode 100644
index c12e336..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateVarFromInternalInlineFun.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal inline fun customSetVar(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    internal inline fun customGetVar(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineVar.accessors.txt
deleted file mode 100644
index 6adab0e..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineVar.accessors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateVarFromInternalInlineVar.kt */
-
-public class A
-    private var privateVar: Int
-        /* TARGET declaration */ private fun <get-privateVar>(): Int
-        /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-    internal var inlineVar: Int
-        internal inline fun <get-inlineVar>(): Int
-            /* ACCESSOR use-site */ access$<get-privateVar>($this = <this>)
-        internal inline fun <set-inlineVar>(value: Int)
-            /* ACCESSOR use-site */ access$<set-privateVar>($this = <this>, <set-?> = value)
-    /* ACCESSOR declaration */ public /* static */ fun access$<get-privateVar>($this: A): Int
-        /* TARGET use-site */ $this.<get-privateVar>()
-    /* ACCESSOR declaration */ public /* static */ fun access$<set-privateVar>($this: A, <set-?>: Int)
-        /* TARGET use-site */ $this.<set-privateVar>(<set-?> = <set-?>)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
-    /* ACCESSOR use-site */ access$<set-privateVar>($this = this, <set-?> = value)
-    /* ACCESSOR use-site */ access$<get-privateVar>($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInInternalInlineFun.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInInternalInlineFun.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInInternalInlineFun.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInPublicInlineFun.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInPublicInlineFun.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInPublicInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInPublicInlineFun.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInPublicInlineFun.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt
deleted file mode 100644
index 42d7a44..0000000
--- a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useSeveralPrivateConstructorsThroughInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=useSeveralPrivateConstructorsThroughInternalInlineFun.kt */
-
-public class A
-    /* TARGET declaration */ private constructor(s: String) /* primary */
-    public constructor()
-        /* TARGET use-site */ A(s = "")
-    /* TARGET declaration */ private constructor(a: String, b: String)
-        /* TARGET use-site */ A(s = a.plus(other = b))
-    /* TARGET declaration */ private constructor(a: Char)
-        /* TARGET use-site */ A(s = a.toString())
-    internal inline fun complexCopy(s: String): A
-        /* ACCESSOR use-site */ access$<init>(s = s)
-        /* ACCESSOR use-site */ access$<init>(a = ' ')
-        /* ACCESSOR use-site */ access$<init>(a = s, b = "")
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(s: String): A
-        /* TARGET use-site */ A(s = s)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(a: String, b: String): A
-        /* TARGET use-site */ A(a = a, b = b)
-    /* ACCESSOR declaration */ public /* static */ fun access$<init>(a: Char): A
-        /* TARGET use-site */ A(a = a)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<init>(s = s)
-    /* ACCESSOR use-site */ access$<init>(a = ' ')
-    /* ACCESSOR use-site */ access$<init>(a = s, b = "")
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
deleted file mode 100644
index ce5071a..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=OK.kt */
-
-private lateinit var o: String?
-    /* TARGET declaration */ private /* static field */ field o: String?
-    /* TARGET declaration */ private fun <get-o>(): String
-        val tmp: String? = #o
-            /* TARGET use-site */ #o
-    /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-        /* TARGET use-site */ #o = <set-?>
-public lateinit var k: String?
-    /* TARGET declaration */ private /* static field */ field k: String?
-    public fun <get-k>(): String
-        val tmp: String? = #k
-            /* TARGET use-site */ #k
-    public fun <set-k>(<set-?>: String)
-        /* TARGET use-site */ #k = <set-?>
-private inline fun doInitializeAndReadOK(): String
-    /* TARGET use-site */ #o
-    /* TARGET use-site */ <set-o>(<set-?> = "O")
-    /* TARGET use-site */ #o
-    local class <no name provided>
-        public fun run()
-            /* TARGET use-site */ #k
-            /* TARGET use-site */ #k
-    /* TARGET use-site */ <get-o>()
-internal inline fun initializeAndReadOK(): String
-    /* ACCESSOR use-site */ access$<get-o>$p$tOKKt()
-    /* ACCESSOR use-site */ access$<set-o>$tOKKt(<set-?> = "O")
-    /* ACCESSOR use-site */ access$<get-o>$p$tOKKt()
-    local class <no name provided>
-        public fun run()
-            /* ACCESSOR use-site */ access$<get-k>$p$tOKKt()
-            /* ACCESSOR use-site */ access$<get-k>$p$tOKKt()
-    /* ACCESSOR use-site */ access$<get-o>$tOKKt()
-/* ACCESSOR declaration */ public fun access$<get-o>$tOKKt(): String
-    /* TARGET use-site */ <get-o>()
-/* ACCESSOR declaration */ public fun access$<set-o>$tOKKt(<set-?>: String)
-    /* TARGET use-site */ <set-o>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<get-o>$p$tOKKt(): String?
-    /* TARGET use-site */ #o
-/* ACCESSOR declaration */ public fun access$<get-k>$p$tOKKt(): String?
-    /* TARGET use-site */ #k
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFun.accessors.txt
deleted file mode 100644
index 6e39549..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFun.accessors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=B.kt */
-
-/* TARGET declaration */ private fun A.privateExtension(): String
-internal inline fun A.internalInlineMethod(): String
-    /* ACCESSOR use-site */ access$privateExtension$tBKt($receiver = <this>)
-/* ACCESSOR declaration */ public fun access$privateExtension$tBKt($receiver: A): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
deleted file mode 100644
index 19efb98..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=B.kt */
-
-/* TARGET declaration */ private fun A.privateExtension(): String
-private inline fun A.privateInlineExtension1(): String
-    /* TARGET use-site */ <this>.privateExtension()
-private inline fun A.privateInlineExtension2(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun A.privateInlineExtension3(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun A.privateInlineExtension4(): String
-    /* TARGET use-site */ this.privateExtension()
-internal inline fun A.internalInlineExtension(): String
-    /* ACCESSOR use-site */ access$privateExtension$tBKt($receiver = this)
-/* ACCESSOR declaration */ public fun access$privateExtension$tBKt($receiver: A): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
deleted file mode 100644
index 9291f20..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=B.kt */
-
-private var A.privateVar: Int
-    /* TARGET declaration */ private fun A.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun A.<set-privateVar>(value: Int)
-internal inline fun A.customSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>$tBKt($receiver = <this>, value = value)
-internal inline fun A.customGetVar(): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>$tBKt($receiver = <this>)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tBKt($receiver: A): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tBKt($receiver: A, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index d6e21ec..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=B.kt */
-
-private var A.privateVar: Int
-    /* TARGET declaration */ private fun A.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun A.<set-privateVar>(value: Int)
-private var A.privateInlineVar1: Int
-    private inline fun A.<get-privateInlineVar1>(): Int
-        /* TARGET use-site */ <this>.<get-privateVar>()
-    private inline fun A.<set-privateInlineVar1>(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(value = value)
-private var A.privateInlineVar2: Int
-    private inline fun A.<get-privateInlineVar2>(): Int
-        /* TARGET use-site */ this.<get-privateVar>()
-    private inline fun A.<set-privateInlineVar2>(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(value = value)
-internal var A.inlineVar: Int
-    internal inline fun A.<get-inlineVar>(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tBKt($receiver = this)
-    internal inline fun A.<set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tBKt($receiver = this, value = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tBKt($receiver: A): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tBKt($receiver: A, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFun.accessors.txt
deleted file mode 100644
index 2fdda4d..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFun.accessors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-/* TARGET declaration */ private fun privateFun(): String
-internal inline fun internalInlineFun(): String
-    /* ACCESSOR use-site */ access$privateFun$tAKt()
-/* ACCESSOR declaration */ public fun access$privateFun$tAKt(): String
-    /* TARGET use-site */ privateFun()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.accessors.txt
deleted file mode 100644
index 5d0718c..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-/* TARGET declaration */ private fun o(): String
-/* TARGET declaration */ private fun k(): String
-internal inline fun internalInlineFun(oo: String, kk: Function0<String>): String
-    oo: String
-        /* ACCESSOR use-site */ access$o$tAKt()
-    kk: Function0<String>
-        local fun <anonymous>(): String
-            /* ACCESSOR use-site */ access$k$tAKt()
-/* ACCESSOR declaration */ public fun access$o$tAKt(): String
-    /* TARGET use-site */ o()
-/* ACCESSOR declaration */ public fun access$k$tAKt(): String
-    /* TARGET use-site */ k()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt
deleted file mode 100644
index 5b4a8ca..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-/* TARGET declaration */ private fun privateMethod(): String
-internal val internalInlineVal: Function0<String>
-    internal inline fun <get-internalInlineVal>(): Function0<String>
-        local fun <anonymous>(): String
-            /* ACCESSOR use-site */ access$privateMethod$tAKt()
-/* ACCESSOR declaration */ public fun access$privateMethod$tAKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index c5064ea..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-/* TARGET declaration */ private fun privateFun(): String
-private inline fun privateInlineFun1(): String
-    /* TARGET use-site */ privateFun()
-private inline fun privateInlineFun2(): String
-    /* TARGET use-site */ privateFun()
-private inline fun privateInlineFun3(): String
-    /* TARGET use-site */ privateFun()
-private inline fun privateInlineFun4(): String
-    /* TARGET use-site */ privateFun()
-internal inline fun internalInlineFun(): String
-    /* ACCESSOR use-site */ access$privateFun$tAKt()
-/* ACCESSOR declaration */ public fun access$privateFun$tAKt(): String
-    /* TARGET use-site */ privateFun()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.accessors.txt
deleted file mode 100644
index 1ba63dc..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-    local class <no name provided>
-        private inline fun impl(): String
-            /* ACCESSOR use-site */ access$privateMethod$tAKt()
-        public fun run(): String
-            /* ACCESSOR use-site */ access$privateMethod$tAKt()
-/* TARGET declaration */ private fun privateMethod(): String
-/* ACCESSOR declaration */ public fun access$privateMethod$tAKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.accessors.txt
deleted file mode 100644
index d6883bc3..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-    val tmp0: <no name provided> =
-        local class <no name provided>
-            public inline fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod$tAKt()
-    /* ACCESSOR use-site */ access$privateMethod$tAKt()
-/* TARGET declaration */ private fun privateMethod(): String
-/* ACCESSOR declaration */ public fun access$privateMethod$tAKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.accessors.txt
deleted file mode 100644
index 5ceb4db8..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-/* TARGET declaration */ private fun onlyInternal(): String
-/* TARGET declaration */ private fun internalAndPublic(): String
-/* TARGET declaration */ private fun internalAndInternalPA(): String
-/* TARGET declaration */ private fun onlyPublic(): String
-/* TARGET declaration */ private fun onlyInternalPA(): String
-/* TARGET declaration */ private fun allEffectivelyPublic(): String
-internal inline fun inlineOnlyInternal1(): String
-    /* ACCESSOR use-site */ access$onlyInternal$tAKt()
-internal inline fun inlineOnlyInternal2(): String
-    /* ACCESSOR use-site */ access$onlyInternal$tAKt()
-internal inline fun inlineInternalAndPublic1(): String
-    /* ACCESSOR use-site */ access$internalAndPublic$tAKt()
-public inline fun inlineInternalAndPublic2(): String
-    /* ACCESSOR use-site */ access$internalAndPublic$tAKt()
-internal inline fun inlineInternalAndInternalPA1(): String
-    /* ACCESSOR use-site */ access$internalAndInternalPA$tAKt()
-internal inline fun inlineInternalAndInternalPA2(): String
-    /* ACCESSOR use-site */ access$internalAndInternalPA$tAKt()
-public inline fun inlineOnlyPublic1(): String
-    /* ACCESSOR use-site */ access$onlyPublic$tAKt()
-public inline fun inlineOnlyPublic2(): String
-    /* ACCESSOR use-site */ access$onlyPublic$tAKt()
-internal inline fun inlineOnlyInternalPA1(): String
-    /* ACCESSOR use-site */ access$onlyInternalPA$tAKt()
-internal inline fun inlineOnlyInternalPA2(): String
-    /* ACCESSOR use-site */ access$onlyInternalPA$tAKt()
-public inline fun inlineAllEffectivelyPublic1(): String
-    /* ACCESSOR use-site */ access$allEffectivelyPublic$tAKt()
-internal inline fun inlineAllEffectivelyPublic2(): String
-    /* ACCESSOR use-site */ access$allEffectivelyPublic$tAKt()
-/* ACCESSOR declaration */ public fun access$onlyInternal$tAKt(): String
-    /* TARGET use-site */ onlyInternal()
-/* ACCESSOR declaration */ public fun access$internalAndPublic$tAKt(): String
-    /* TARGET use-site */ internalAndPublic()
-/* ACCESSOR declaration */ public fun access$internalAndInternalPA$tAKt(): String
-    /* TARGET use-site */ internalAndInternalPA()
-/* ACCESSOR declaration */ public fun access$onlyPublic$tAKt(): String
-    /* TARGET use-site */ onlyPublic()
-/* ACCESSOR declaration */ public fun access$onlyInternalPA$tAKt(): String
-    /* TARGET use-site */ onlyInternalPA()
-/* ACCESSOR declaration */ public fun access$allEffectivelyPublic$tAKt(): String
-    /* TARGET use-site */ allEffectivelyPublic()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelLateinitVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelLateinitVar.accessors.txt
deleted file mode 100644
index 1b3c393..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelLateinitVar.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-private lateinit var o: String?
-    /* TARGET declaration */ private fun <get-o>(): String
-    /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-public class A
-    internal inline fun inlineMethod(): String
-        local fun <anonymous>()
-            /* ACCESSOR use-site */ access$<set-o>$tAKt(<set-?> = "O")
-        /* ACCESSOR use-site */ access$<get-o>$tAKt()
-/* ACCESSOR declaration */ public fun access$<get-o>$tAKt(): String
-    /* TARGET use-site */ <get-o>()
-/* ACCESSOR declaration */ public fun access$<set-o>$tAKt(<set-?>: String)
-    /* TARGET use-site */ <set-o>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.accessors.txt
deleted file mode 100644
index 3d68222..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public var privateSetterVarA: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarA>(<set-?>: Int)
-public var privateSetterVarB: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarB>(value: Int)
-internal inline fun customSetVarA(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarA>$tAKt(<set-?> = value)
-internal inline fun customSetVarB(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarB>$tAKt(value = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarA>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVarA>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarB>$tAKt(value: Int)
-    /* TARGET use-site */ <set-privateSetterVarB>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.accessors.txt
deleted file mode 100644
index f535fd7..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public var privateSetterVarA: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarA>(<set-?>: Int)
-public var privateSetterVarB: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarB>(value: Int)
-internal var inlineVarA: Int
-    internal inline fun <set-inlineVarA>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateSetterVarA>$tAKt(<set-?> = value)
-internal var inlineVarB: Int
-    internal inline fun <set-inlineVarB>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateSetterVarB>$tAKt(value = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarA>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVarA>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarB>$tAKt(value: Int)
-    /* TARGET use-site */ <set-privateSetterVarB>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSuspendFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSuspendFun.accessors.txt
deleted file mode 100644
index 9ed363d..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSuspendFun.accessors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-/* TARGET declaration */ private suspend fun privateSuspendMethod(): String
-internal suspend inline fun internalInline(): String
-    /* ACCESSOR use-site */ access$privateSuspendMethod$tAKt()
-/* ACCESSOR declaration */ public suspend fun access$privateSuspendMethod$tAKt(): String
-    /* TARGET use-site */ privateSuspendMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.accessors.txt
deleted file mode 100644
index e84254d..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal inline fun customSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-internal inline fun customGetVar(): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.accessors.txt
deleted file mode 100644
index e83fb98..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private val privateVal: Int
-    /* TARGET declaration */ private fun <get-privateVal>(): Int
-private val privateValFunctional: Function0<Int>
-    /* TARGET declaration */ private fun <get-privateValFunctional>(): Function0<Int>
-internal inline fun executor(param: Int): Int
-    param: Int
-        /* ACCESSOR use-site */ access$<get-privateVal>$tAKt()
-internal inline fun executorFunctional(noinline block: Function0<Int>): Int
-    noinline block: Function0<Int>
-        /* ACCESSOR use-site */ access$<get-privateValFunctional>$tAKt()
-/* ACCESSOR declaration */ public fun access$<get-privateVal>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVal>()
-/* ACCESSOR declaration */ public fun access$<get-privateValFunctional>$tAKt(): Function0<Int>
-    /* TARGET use-site */ <get-privateValFunctional>()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.accessors.txt
deleted file mode 100644
index 4684a2e..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal var inlineVar: Int
-    internal inline fun <get-inlineVar>(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-    internal inline fun <set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index 88f43e4..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public var privateSetterVar: Int
-    /* TARGET declaration */ private fun <set-privateSetterVar>(<set-?>: Int)
-private inline fun privateSetVar1(value: Int)
-    /* TARGET use-site */ <set-privateSetterVar>(<set-?> = value)
-private inline fun privateSetVar2(value: Int)
-    /* TARGET use-site */ <set-privateSetterVar>(<set-?> = value)
-internal inline fun internalSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVar>$tAKt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index 90d7462..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-private inline fun privateSetVar1(value: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-private inline fun privateGetVar1(): Int
-    /* TARGET use-site */ <get-privateVar>()
-private inline fun privateSetVar2(value: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-private inline fun privateGetVar2(): Int
-    /* TARGET use-site */ <get-privateVar>()
-internal inline fun internalSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-internal inline fun internalGetVar(): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index 1959be6..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-private var privateInlineVar1: Int
-    private inline fun <get-privateInlineVar1>(): Int
-        /* TARGET use-site */ <get-privateVar>()
-    private inline fun <set-privateInlineVar1>(value: Int)
-        /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-private var privateInlineVar2: Int
-    private inline fun <get-privateInlineVar2>(): Int
-        /* TARGET use-site */ <get-privateVar>()
-    private inline fun <set-privateInlineVar2>(value: Int)
-        /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-internal var inlineVar: Int
-    internal inline fun <get-inlineVar>(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-    internal inline fun <set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingFunAccessors.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingFunAccessors.accessors.txt
deleted file mode 100644
index 8569b49..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingFunAccessors.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=org.sample fileName=file1.kt */
-
-/* TARGET declaration */ private fun fileName(): String
-internal inline fun inlineFun1(): String
-    /* ACCESSOR use-site */ access$fileName$tFile1Kt()
-/* ACCESSOR declaration */ public fun access$fileName$tFile1Kt(): String
-    /* TARGET use-site */ fileName()
-
-
-/* FILE package=org.sample fileName=file2.kt */
-
-/* TARGET declaration */ private fun fileName(): String
-internal inline fun inlineFun2(): String
-    /* ACCESSOR use-site */ access$fileName$tFile2Kt()
-/* ACCESSOR declaration */ public fun access$fileName$tFile2Kt(): String
-    /* TARGET use-site */ fileName()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingVarAccessors.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingVarAccessors.accessors.txt
deleted file mode 100644
index 0605431..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingVarAccessors.accessors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=org.sample fileName=file1.kt */
-
-private var fileNameVar: String
-    /* TARGET declaration */ private fun <get-fileNameVar>(): String
-    /* TARGET declaration */ private fun <set-fileNameVar>(<set-?>: String)
-internal var fileNameInlineVar1: String
-    internal inline fun <get-fileNameInlineVar1>(): String
-        /* ACCESSOR use-site */ access$<get-fileNameVar>$tFile1Kt()
-    internal inline fun <set-fileNameInlineVar1>(value: String)
-        /* ACCESSOR use-site */ access$<set-fileNameVar>$tFile1Kt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-fileNameVar>$tFile1Kt(): String
-    /* TARGET use-site */ <get-fileNameVar>()
-/* ACCESSOR declaration */ public fun access$<set-fileNameVar>$tFile1Kt(<set-?>: String)
-    /* TARGET use-site */ <set-fileNameVar>(<set-?> = <set-?>)
-
-
-/* FILE package=org.sample fileName=file2.kt */
-
-private var fileNameVar: String
-    /* TARGET declaration */ private fun <get-fileNameVar>(): String
-    /* TARGET declaration */ private fun <set-fileNameVar>(<set-?>: String)
-internal var fileNameInlineVar2: String
-    internal inline fun <get-fileNameInlineVar2>(): String
-        /* ACCESSOR use-site */ access$<get-fileNameVar>$tFile2Kt()
-    internal inline fun <set-fileNameInlineVar2>(value: String)
-        /* ACCESSOR use-site */ access$<set-fileNameVar>$tFile2Kt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-fileNameVar>$tFile2Kt(): String
-    /* TARGET use-site */ <get-fileNameVar>()
-/* ACCESSOR declaration */ public fun access$<set-fileNameVar>$tFile2Kt(<set-?>: String)
-    /* TARGET use-site */ <set-fileNameVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
deleted file mode 100644
index 0c9f38a..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=OK.kt */
-
-internal inline fun initializeAndReadOK(): String
-    /* ACCESSOR use-site */ access$<get-o>$p$tOKKt()
-    /* ACCESSOR use-site */ access$<set-o>$tOKKt(<set-?> = "O")
-    /* ACCESSOR use-site */ access$<get-o>$p$tOKKt()
-    local class <no name provided>
-        public fun run()
-            /* ACCESSOR use-site */ access$<get-k>$p$tOKKt()
-            /* ACCESSOR use-site */ access$<get-k>$p$tOKKt()
-    /* ACCESSOR use-site */ access$<get-o>$tOKKt()
-private inline fun doInitializeAndReadOK(): String
-    /* TARGET use-site */ #o
-    /* TARGET use-site */ <set-o>(<set-?> = "O")
-    /* TARGET use-site */ #o
-    local class <no name provided>
-        public fun run()
-            /* TARGET use-site */ #k
-            /* TARGET use-site */ #k
-    /* TARGET use-site */ <get-o>()
-private lateinit var o: String?
-    /* TARGET declaration */ private /* static field */ field o: String?
-    /* TARGET declaration */ private fun <get-o>(): String
-        val tmp: String? = #o
-            /* TARGET use-site */ #o
-    /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-        /* TARGET use-site */ #o = <set-?>
-public lateinit var k: String?
-    /* TARGET declaration */ private /* static field */ field k: String?
-    public fun <get-k>(): String
-        val tmp: String? = #k
-            /* TARGET use-site */ #k
-    public fun <set-k>(<set-?>: String)
-        /* TARGET use-site */ #k = <set-?>
-/* ACCESSOR declaration */ public fun access$<get-o>$tOKKt(): String
-    /* TARGET use-site */ <get-o>()
-/* ACCESSOR declaration */ public fun access$<set-o>$tOKKt(<set-?>: String)
-    /* TARGET use-site */ <set-o>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<get-o>$p$tOKKt(): String?
-    /* TARGET use-site */ #o
-/* ACCESSOR declaration */ public fun access$<get-k>$p$tOKKt(): String?
-    /* TARGET use-site */ #k
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFun.accessors.txt
deleted file mode 100644
index 918db09..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFun.accessors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal inline fun String.internalInlineMethod(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = <this>)
-/* TARGET declaration */ private fun String.privateExtension(): String
-/* ACCESSOR declaration */ public fun access$privateExtension$tAKt($receiver: String): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
deleted file mode 100644
index 7f83de8..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.accessors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal inline fun String.internalInlineExtension(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-internal fun topLevelFun(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-internal inline fun topLevelInlineFun(): String
-    /* ACCESSOR use-site */ access$privateExtension$tAKt($receiver = this)
-private inline fun String.privateInlineExtension4(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun String.privateInlineExtension3(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun String.privateInlineExtension2(): String
-    /* TARGET use-site */ this.privateExtension()
-private inline fun String.privateInlineExtension1(): String
-    /* TARGET use-site */ <this>.privateExtension()
-/* TARGET declaration */ private fun String.privateExtension(): String
-/* ACCESSOR declaration */ public fun access$privateExtension$tAKt($receiver: String): String
-    /* TARGET use-site */ $receiver.privateExtension()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
deleted file mode 100644
index d856740..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal inline fun customGetVar(): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>$tAKt($receiver = 0)
-internal inline fun customSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>$tAKt($receiver = 0, value = value)
-private var Int.privateVar: Int
-    /* TARGET declaration */ private fun Int.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun Int.<set-privateVar>(value: Int)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt($receiver: Int): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt($receiver: Int, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index 8356835..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal var Int.inlineVar: Int
-    internal inline fun Int.<get-inlineVar>(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tAKt($receiver = this)
-    internal inline fun Int.<set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tAKt($receiver = this, value = value)
-private var Int.privateInlineVar2: Int
-    private inline fun Int.<get-privateInlineVar2>(): Int
-        /* TARGET use-site */ this.<get-privateVar>()
-    private inline fun Int.<set-privateInlineVar2>(value: Int)
-        /* TARGET use-site */ this.<set-privateVar>(value = value)
-private var Int.privateInlineVar1: Int
-    private inline fun Int.<get-privateInlineVar1>(): Int
-        /* TARGET use-site */ <this>.<get-privateVar>()
-    private inline fun Int.<set-privateInlineVar1>(value: Int)
-        /* TARGET use-site */ <this>.<set-privateVar>(value = value)
-private var Int.privateVar: Int
-    /* TARGET declaration */ private fun Int.<get-privateVar>(): Int
-    /* TARGET declaration */ private fun Int.<set-privateVar>(value: Int)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt($receiver: Int): Int
-    /* TARGET use-site */ $receiver.<get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt($receiver: Int, value: Int)
-    /* TARGET use-site */ $receiver.<set-privateVar>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFun.accessors.txt
deleted file mode 100644
index 70f9442..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFun.accessors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal inline fun internalInlineFun(): String
-    /* ACCESSOR use-site */ access$privateFun$tAKt()
-/* TARGET declaration */ private fun privateFun(): String
-/* ACCESSOR declaration */ public fun access$privateFun$tAKt(): String
-    /* TARGET use-site */ privateFun()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.accessors.txt
deleted file mode 100644
index 234cafd..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal inline fun internalInlineFun(oo: String, kk: Function0<String>): String
-    oo: String
-        /* ACCESSOR use-site */ access$o$tAKt()
-    kk: Function0<String>
-        local fun <anonymous>(): String
-            /* ACCESSOR use-site */ access$k$tAKt()
-/* TARGET declaration */ private fun o(): String
-/* TARGET declaration */ private fun k(): String
-/* ACCESSOR declaration */ public fun access$o$tAKt(): String
-    /* TARGET use-site */ o()
-/* ACCESSOR declaration */ public fun access$k$tAKt(): String
-    /* TARGET use-site */ k()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt
deleted file mode 100644
index 5008dad..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-internal val internalInlineVal: Function0<String>
-    internal inline fun <get-internalInlineVal>(): Function0<String>
-        local fun <anonymous>(): String
-            /* ACCESSOR use-site */ access$privateMethod$tAKt()
-/* TARGET declaration */ private fun privateMethod(): String
-/* ACCESSOR declaration */ public fun access$privateMethod$tAKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index ab9565b..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal inline fun internalInlineFun(): String
-    /* ACCESSOR use-site */ access$privateFun$tAKt()
-private inline fun privateInlineFun4(): String
-    /* TARGET use-site */ privateFun()
-private inline fun privateInlineFun3(): String
-    /* TARGET use-site */ privateFun()
-private inline fun privateInlineFun2(): String
-    /* TARGET use-site */ privateFun()
-private inline fun privateInlineFun1(): String
-    /* TARGET use-site */ privateFun()
-/* TARGET declaration */ private fun privateFun(): String
-/* ACCESSOR declaration */ public fun access$privateFun$tAKt(): String
-    /* TARGET use-site */ privateFun()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.accessors.txt
deleted file mode 100644
index 4d52492..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-    local class <no name provided>
-        private inline fun impl(): String
-            /* ACCESSOR use-site */ access$privateMethod$tAKt()
-        public fun run(): String
-            /* ACCESSOR use-site */ access$privateMethod$tAKt()
-/* TARGET declaration */ private fun privateMethod(): String
-/* ACCESSOR declaration */ public fun access$privateMethod$tAKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.accessors.txt
deleted file mode 100644
index 1d36707..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-    val tmp0: <no name provided> =
-        local class <no name provided>
-            public inline fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod$tAKt()
-    /* ACCESSOR use-site */ access$privateMethod$tAKt()
-/* TARGET declaration */ private fun privateMethod(): String
-/* ACCESSOR declaration */ public fun access$privateMethod$tAKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.accessors.txt
deleted file mode 100644
index 42b9345..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-internal inline fun inlineOnlyInternal1(): String
-    /* ACCESSOR use-site */ access$onlyInternal$tAKt()
-internal inline fun inlineOnlyInternal2(): String
-    /* ACCESSOR use-site */ access$onlyInternal$tAKt()
-internal inline fun inlineInternalAndPublic1(): String
-    /* ACCESSOR use-site */ access$internalAndPublic$tAKt()
-public inline fun inlineInternalAndPublic2(): String
-    /* ACCESSOR use-site */ access$internalAndPublic$tAKt()
-internal inline fun inlineInternalAndInternalPA1(): String
-    /* ACCESSOR use-site */ access$internalAndInternalPA$tAKt()
-internal inline fun inlineInternalAndInternalPA2(): String
-    /* ACCESSOR use-site */ access$internalAndInternalPA$tAKt()
-public inline fun inlineOnlyPublic1(): String
-    /* ACCESSOR use-site */ access$onlyPublic$tAKt()
-public inline fun inlineOnlyPublic2(): String
-    /* ACCESSOR use-site */ access$onlyPublic$tAKt()
-internal inline fun inlineOnlyInternalPA1(): String
-    /* ACCESSOR use-site */ access$onlyInternalPA$tAKt()
-internal inline fun inlineOnlyInternalPA2(): String
-    /* ACCESSOR use-site */ access$onlyInternalPA$tAKt()
-public inline fun inlineAllEffectivelyPublic1(): String
-    /* ACCESSOR use-site */ access$allEffectivelyPublic$tAKt()
-internal inline fun inlineAllEffectivelyPublic2(): String
-    /* ACCESSOR use-site */ access$allEffectivelyPublic$tAKt()
-/* TARGET declaration */ private fun onlyInternal(): String
-/* TARGET declaration */ private fun internalAndPublic(): String
-/* TARGET declaration */ private fun internalAndInternalPA(): String
-/* TARGET declaration */ private fun onlyPublic(): String
-/* TARGET declaration */ private fun onlyInternalPA(): String
-/* TARGET declaration */ private fun allEffectivelyPublic(): String
-/* ACCESSOR declaration */ public fun access$onlyInternal$tAKt(): String
-    /* TARGET use-site */ onlyInternal()
-/* ACCESSOR declaration */ public fun access$internalAndPublic$tAKt(): String
-    /* TARGET use-site */ internalAndPublic()
-/* ACCESSOR declaration */ public fun access$internalAndInternalPA$tAKt(): String
-    /* TARGET use-site */ internalAndInternalPA()
-/* ACCESSOR declaration */ public fun access$onlyPublic$tAKt(): String
-    /* TARGET use-site */ onlyPublic()
-/* ACCESSOR declaration */ public fun access$onlyInternalPA$tAKt(): String
-    /* TARGET use-site */ onlyInternalPA()
-/* ACCESSOR declaration */ public fun access$allEffectivelyPublic$tAKt(): String
-    /* TARGET use-site */ allEffectivelyPublic()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelLateinitVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelLateinitVar.accessors.txt
deleted file mode 100644
index 991edc3..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelLateinitVar.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-public class A
-    internal inline fun inlineMethod(): String
-        local fun <anonymous>()
-            /* ACCESSOR use-site */ access$<set-o>$tAKt(<set-?> = "O")
-        /* ACCESSOR use-site */ access$<get-o>$tAKt()
-private lateinit var o: String?
-    /* TARGET declaration */ private fun <get-o>(): String
-    /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-/* ACCESSOR declaration */ public fun access$<get-o>$tAKt(): String
-    /* TARGET use-site */ <get-o>()
-/* ACCESSOR declaration */ public fun access$<set-o>$tAKt(<set-?>: String)
-    /* TARGET use-site */ <set-o>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.accessors.txt
deleted file mode 100644
index 2fd348a..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public var privateSetterVarA: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarA>(<set-?>: Int)
-public var privateSetterVarB: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarB>(value: Int)
-internal inline fun customSetVarA(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarA>$tAKt(<set-?> = value)
-internal inline fun customSetVarB(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarB>$tAKt(value = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarA>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVarA>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarB>$tAKt(value: Int)
-    /* TARGET use-site */ <set-privateSetterVarB>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.accessors.txt
deleted file mode 100644
index a077bbd..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public var privateSetterVarA: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarA>(<set-?>: Int)
-public var privateSetterVarB: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarB>(value: Int)
-internal var inlineVarA: Int
-    internal inline fun <set-inlineVarA>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateSetterVarA>$tAKt(<set-?> = value)
-internal var inlineVarB: Int
-    internal inline fun <set-inlineVarB>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateSetterVarB>$tAKt(value = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarA>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVarA>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarB>$tAKt(value: Int)
-    /* TARGET use-site */ <set-privateSetterVarB>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSuspendFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSuspendFun.accessors.txt
deleted file mode 100644
index 1ce7d52..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSuspendFun.accessors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-internal suspend inline fun internalInline(): String
-    /* ACCESSOR use-site */ access$privateSuspendMethod$tAKt()
-/* TARGET declaration */ private suspend fun privateSuspendMethod(): String
-/* ACCESSOR declaration */ public suspend fun access$privateSuspendMethod$tAKt(): String
-    /* TARGET use-site */ privateSuspendMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.accessors.txt
deleted file mode 100644
index e7bd472..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.accessors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal inline fun customGetVar(): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-internal inline fun customSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.accessors.txt
deleted file mode 100644
index 7927180..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.accessors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private val privateVal: Int
-    /* TARGET declaration */ private fun <get-privateVal>(): Int
-private val privateValFunctional: Function0<Int>
-    /* TARGET declaration */ private fun <get-privateValFunctional>(): Function0<Int>
-internal inline fun executor(param: Int): Int
-    param: Int
-        /* ACCESSOR use-site */ access$<get-privateVal>$tAKt()
-internal inline fun executorFunctional(noinline block: Function0<Int>): Int
-    noinline block: Function0<Int>
-        /* ACCESSOR use-site */ access$<get-privateValFunctional>$tAKt()
-/* ACCESSOR declaration */ public fun access$<get-privateVal>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVal>()
-/* ACCESSOR declaration */ public fun access$<get-privateValFunctional>$tAKt(): Function0<Int>
-    /* TARGET use-site */ <get-privateValFunctional>()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.accessors.txt
deleted file mode 100644
index a4d8762..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.accessors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal var inlineVar: Int
-    internal inline fun <get-inlineVar>(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-    internal inline fun <set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index 2fb3418..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-public var privateSetterVar: Int
-    /* TARGET declaration */ private fun <set-privateSetterVar>(<set-?>: Int)
-internal inline fun internalSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVar>$tAKt(<set-?> = value)
-private inline fun privateSetVar2(value: Int)
-    /* TARGET use-site */ <set-privateSetterVar>(<set-?> = value)
-private inline fun privateSetVar1(value: Int)
-    /* TARGET use-site */ <set-privateSetterVar>(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.accessors.txt
deleted file mode 100644
index 84e582a..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.accessors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal inline fun internalGetVar(): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-internal inline fun internalSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-private inline fun privateGetVar2(): Int
-    /* TARGET use-site */ <get-privateVar>()
-private inline fun privateSetVar2(value: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-private inline fun privateGetVar1(): Int
-    /* TARGET use-site */ <get-privateVar>()
-private inline fun privateSetVar1(value: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.accessors.txt
deleted file mode 100644
index 90b458f..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.accessors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=a.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal var inlineVar: Int
-    internal inline fun <get-inlineVar>(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tAKt()
-    internal inline fun <set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tAKt(<set-?> = value)
-private var privateInlineVar2: Int
-    private inline fun <get-privateInlineVar2>(): Int
-        /* TARGET use-site */ <get-privateVar>()
-    private inline fun <set-privateInlineVar2>(value: Int)
-        /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-private var privateInlineVar1: Int
-    private inline fun <get-privateInlineVar1>(): Int
-        /* TARGET use-site */ <get-privateVar>()
-    private inline fun <set-privateInlineVar1>(value: Int)
-        /* TARGET use-site */ <set-privateVar>(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tAKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tAKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingFunAccessors.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingFunAccessors.accessors.txt
deleted file mode 100644
index 9b1bf4e..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingFunAccessors.accessors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MODULE name=<lib1> */
-
-/* FILE package=org.sample fileName=file1.kt */
-
-internal inline fun inlineFun1(): String
-    /* ACCESSOR use-site */ access$libName$tFile1Kt()
-/* TARGET declaration */ private fun libName(): String
-/* ACCESSOR declaration */ public fun access$libName$tFile1Kt(): String
-    /* TARGET use-site */ libName()
-
-
-/* MODULE name=<lib2> */
-
-/* FILE package=org.sample fileName=file2.kt */
-
-internal inline fun inlineFun2(): String
-    /* ACCESSOR use-site */ access$libName$tFile2Kt()
-/* TARGET declaration */ private fun libName(): String
-/* ACCESSOR declaration */ public fun access$libName$tFile2Kt(): String
-    /* TARGET use-site */ libName()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingVarAccessors.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingVarAccessors.accessors.txt
deleted file mode 100644
index 544b54d..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingVarAccessors.accessors.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MODULE name=<lib1> */
-
-/* FILE package=org.sample fileName=file1.kt */
-
-private var libName: String
-    /* TARGET declaration */ private fun <get-libName>(): String
-    /* TARGET declaration */ private fun <set-libName>(<set-?>: String)
-internal var libNameInlineVar1: String
-    internal inline fun <get-libNameInlineVar1>(): String
-        /* ACCESSOR use-site */ access$<get-libName>$tFile1Kt()
-    internal inline fun <set-libNameInlineVar1>(value: String)
-        /* ACCESSOR use-site */ access$<set-libName>$tFile1Kt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-libName>$tFile1Kt(): String
-    /* TARGET use-site */ <get-libName>()
-/* ACCESSOR declaration */ public fun access$<set-libName>$tFile1Kt(<set-?>: String)
-    /* TARGET use-site */ <set-libName>(<set-?> = <set-?>)
-
-
-/* MODULE name=<lib2> */
-
-/* FILE package=org.sample fileName=file2.kt */
-
-private var libName: String
-    /* TARGET declaration */ private fun <get-libName>(): String
-    /* TARGET declaration */ private fun <set-libName>(<set-?>: String)
-internal var libNameInlineVar2: String
-    internal inline fun <get-libNameInlineVar2>(): String
-        /* ACCESSOR use-site */ access$<get-libName>$tFile2Kt()
-    internal inline fun <set-libNameInlineVar2>(value: String)
-        /* ACCESSOR use-site */ access$<set-libName>$tFile2Kt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<get-libName>$tFile2Kt(): String
-    /* TARGET use-site */ <get-libName>()
-/* ACCESSOR declaration */ public fun access$<set-libName>$tFile2Kt(<set-?>: String)
-    /* TARGET use-site */ <set-libName>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/usePrivateTopLevelConstValFromInternalInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateTopLevelLateinitVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateTopLevelLateinitVar.accessors.txt
deleted file mode 100644
index 252d339..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateTopLevelLateinitVar.accessors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingPrivateTopLevelLateinitVar.kt */
-
-private lateinit var o: String?
-    /* TARGET declaration */ private fun <get-o>(): String
-    /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-public class A
-    internal inline fun inlineMethod(): String
-        local fun <anonymous>()
-            /* ACCESSOR use-site */ access$<set-o>$tLeakingPrivateTopLevelLateinitVarKt(<set-?> = "O")
-        /* ACCESSOR use-site */ access$<get-o>$tLeakingPrivateTopLevelLateinitVarKt()
-public fun box(): String
-    local fun <anonymous>()
-        /* ACCESSOR use-site */ access$<set-o>$tLeakingPrivateTopLevelLateinitVarKt(<set-?> = "O")
-    /* ACCESSOR use-site */ access$<get-o>$tLeakingPrivateTopLevelLateinitVarKt()
-/* ACCESSOR declaration */ public fun access$<get-o>$tLeakingPrivateTopLevelLateinitVarKt(): String
-    /* TARGET use-site */ <get-o>()
-/* ACCESSOR declaration */ public fun access$<set-o>$tLeakingPrivateTopLevelLateinitVarKt(<set-?>: String)
-    /* TARGET use-site */ <set-o>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt
deleted file mode 100644
index bcee592..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=useLateinitIsInitializedFromInternalInline.kt */
-
-private lateinit var o: String?
-    /* TARGET declaration */ private /* static field */ field o: String?
-    /* TARGET declaration */ private fun <get-o>(): String
-        val tmp: String? = #o
-            /* TARGET use-site */ #o
-    /* TARGET declaration */ private fun <set-o>(<set-?>: String)
-        /* TARGET use-site */ #o = <set-?>
-public lateinit var k: String?
-    /* TARGET declaration */ private /* static field */ field k: String?
-    public fun <get-k>(): String
-        val tmp: String? = #k
-            /* TARGET use-site */ #k
-    public fun <set-k>(<set-?>: String)
-        /* TARGET use-site */ #k = <set-?>
-private inline fun doInitializeAndReadOK(): String
-    /* TARGET use-site */ #o
-    /* TARGET use-site */ <set-o>(<set-?> = "O")
-    /* TARGET use-site */ #o
-    local class <no name provided>
-        public fun run()
-            /* TARGET use-site */ #k
-            /* TARGET use-site */ #k
-    /* TARGET use-site */ <get-o>()
-internal inline fun initializeAndReadOK(): String
-    /* ACCESSOR use-site */ access$<get-o>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-    /* ACCESSOR use-site */ access$<set-o>$tUseLateinitIsInitializedFromInternalInlineKt(<set-?> = "O")
-    /* ACCESSOR use-site */ access$<get-o>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-    local class <no name provided>
-        public fun run()
-            /* ACCESSOR use-site */ access$<get-k>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-            /* ACCESSOR use-site */ access$<get-k>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-    /* ACCESSOR use-site */ access$<get-o>$tUseLateinitIsInitializedFromInternalInlineKt()
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-o>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-    /* ACCESSOR use-site */ access$<set-o>$tUseLateinitIsInitializedFromInternalInlineKt(<set-?> = "O")
-    /* ACCESSOR use-site */ access$<get-o>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-    local class <no name provided>
-        public fun run()
-            /* ACCESSOR use-site */ access$<get-k>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-            /* ACCESSOR use-site */ access$<get-k>$p$tUseLateinitIsInitializedFromInternalInlineKt()
-    /* ACCESSOR use-site */ access$<get-o>$tUseLateinitIsInitializedFromInternalInlineKt()
-/* ACCESSOR declaration */ public fun access$<get-o>$tUseLateinitIsInitializedFromInternalInlineKt(): String
-    /* TARGET use-site */ <get-o>()
-/* ACCESSOR declaration */ public fun access$<set-o>$tUseLateinitIsInitializedFromInternalInlineKt(<set-?>: String)
-    /* TARGET use-site */ <set-o>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<get-o>$p$tUseLateinitIsInitializedFromInternalInlineKt(): String?
-    /* TARGET use-site */ #o
-/* ACCESSOR declaration */ public fun access$<get-k>$p$tUseLateinitIsInitializedFromInternalInlineKt(): String?
-    /* TARGET use-site */ #k
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughtPrivateTopLevelFun.accessors-narrowed.txt
similarity index 100%
copy from compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.accessors.txt
copy to compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughtPrivateTopLevelFun.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughtPrivateTopLevelFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughtPrivateTopLevelFun.accessors.txt
deleted file mode 100644
index 6908887..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughtPrivateTopLevelFun.accessors.txt
+++ /dev/null
@@ -1 +0,0 @@
-/* empty dump */
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelExtensionFunFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelExtensionFunFromInternalInline.accessors.txt
deleted file mode 100644
index 95a735d..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelExtensionFunFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelExtensionFunFromInternalInline.kt */
-
-/* TARGET declaration */ private fun String.privateFun(): String
-internal inline fun internalInlineFun(): String
-    /* ACCESSOR use-site */ access$privateFun$tUsePrivateTopLevelExtensionFunFromInternalInlineKt($receiver = "O")
-public fun box(): String
-    /* ACCESSOR use-site */ access$privateFun$tUsePrivateTopLevelExtensionFunFromInternalInlineKt($receiver = "O")
-/* ACCESSOR declaration */ public fun access$privateFun$tUsePrivateTopLevelExtensionFunFromInternalInlineKt($receiver: String): String
-    /* TARGET use-site */ $receiver.privateFun()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromDefaultArguments.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromDefaultArguments.accessors.txt
deleted file mode 100644
index 7bd02bb..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromDefaultArguments.accessors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelFunFromDefaultArguments.kt */
-
-/* TARGET declaration */ private fun o(): String
-/* TARGET declaration */ private fun k(): String
-internal inline fun internalInlineFun(oo: String, kk: Function0<String>): String
-    oo: String
-        /* ACCESSOR use-site */ access$o$tUsePrivateTopLevelFunFromDefaultArgumentsKt()
-    kk: Function0<String>
-        local fun <anonymous>(): String
-            /* ACCESSOR use-site */ access$k$tUsePrivateTopLevelFunFromDefaultArgumentsKt()
-public fun box(): String
-    val oo: String =
-        /* ACCESSOR use-site */ access$o$tUsePrivateTopLevelFunFromDefaultArgumentsKt()
-    /* ACCESSOR use-site */ access$k$tUsePrivateTopLevelFunFromDefaultArgumentsKt()
-/* ACCESSOR declaration */ public fun access$o$tUsePrivateTopLevelFunFromDefaultArgumentsKt(): String
-    /* TARGET use-site */ o()
-/* ACCESSOR declaration */ public fun access$k$tUsePrivateTopLevelFunFromDefaultArgumentsKt(): String
-    /* TARGET use-site */ k()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromInternalInline.accessors.txt
deleted file mode 100644
index 58e20a7..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromInternalInline.accessors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelFunFromInternalInline.kt */
-
-/* TARGET declaration */ private fun privateFun(): String
-internal inline fun internalInlineFun(): String
-    /* ACCESSOR use-site */ access$privateFun$tUsePrivateTopLevelFunFromInternalInlineKt()
-public fun box(): String
-    /* ACCESSOR use-site */ access$privateFun$tUsePrivateTopLevelFunFromInternalInlineKt()
-/* ACCESSOR declaration */ public fun access$privateFun$tUsePrivateTopLevelFunFromInternalInlineKt(): String
-    /* TARGET use-site */ privateFun()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt
deleted file mode 100644
index 8d0ae5b..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsideInternalInline.accessors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelFunFromLambdaInsideInternalInline.kt */
-
-/* TARGET declaration */ private fun privateMethod(): String
-internal val internalInlineVal: Function0<String>
-    internal inline fun <get-internalInlineVal>(): Function0<String>
-        local fun <anonymous>(): String
-            /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunFromLambdaInsideInternalInlineKt()
-public fun box(): String
-    local fun <anonymous>(): String
-        /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunFromLambdaInsideInternalInlineKt()
-/* ACCESSOR declaration */ public fun access$privateMethod$tUsePrivateTopLevelFunFromLambdaInsideInternalInlineKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsidePublicInline.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsidePublicInline.accessors-narrowed.txt
similarity index 100%
rename from compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsidePublicInline.accessors.txt
rename to compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsidePublicInline.accessors-narrowed.txt
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.accessors.txt
deleted file mode 100644
index 25197c8..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.kt */
-
-internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-    local class <no name provided>
-        private inline fun impl(): String
-            /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePrivateInlineMethodInLocalObjectKt()
-        public fun run(): String
-            /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePrivateInlineMethodInLocalObjectKt()
-/* TARGET declaration */ private fun privateMethod(): String
-public fun box(): String
-    local class <no name provided>
-        private inline fun impl(): String
-            /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePrivateInlineMethodInLocalObjectKt()
-        public fun run(): String
-            /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePrivateInlineMethodInLocalObjectKt()
-/* ACCESSOR declaration */ public fun access$privateMethod$tUsePrivateTopLevelFunInsidePrivateInlineMethodInLocalObjectKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.accessors.txt
deleted file mode 100644
index b105dd9..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.kt */
-
-internal inline fun internalInlineMethod(crossinline f: Function0<String>): String
-    val tmp0: <no name provided> =
-        local class <no name provided>
-            public inline fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePublicInlineMethodInLocalObjectKt()
-    /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePublicInlineMethodInLocalObjectKt()
-/* TARGET declaration */ private fun privateMethod(): String
-public fun box(): String
-    val tmp0: <no name provided> =
-        local class <no name provided>
-            public inline fun run(): String
-                /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePublicInlineMethodInLocalObjectKt()
-    /* ACCESSOR use-site */ access$privateMethod$tUsePrivateTopLevelFunInsidePublicInlineMethodInLocalObjectKt()
-/* ACCESSOR declaration */ public fun access$privateMethod$tUsePrivateTopLevelFunInsidePublicInlineMethodInLocalObjectKt(): String
-    /* TARGET use-site */ privateMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunWithDifferentVisibility.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunWithDifferentVisibility.accessors.txt
deleted file mode 100644
index a518c10..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunWithDifferentVisibility.accessors.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelFunWithDifferentVisibility.kt */
-
-/* TARGET declaration */ private fun onlyInternal(): String
-/* TARGET declaration */ private fun internalAndPublic(): String
-/* TARGET declaration */ private fun internalAndInternalPA(): String
-/* TARGET declaration */ private fun onlyPublic(): String
-/* TARGET declaration */ private fun onlyInternalPA(): String
-/* TARGET declaration */ private fun allEffectivelyPublic(): String
-internal inline fun inlineOnlyInternal1(): String
-    /* ACCESSOR use-site */ access$onlyInternal$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-internal inline fun inlineOnlyInternal2(): String
-    /* ACCESSOR use-site */ access$onlyInternal$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-internal inline fun inlineInternalAndPublic1(): String
-    /* ACCESSOR use-site */ access$internalAndPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-public inline fun inlineInternalAndPublic2(): String
-    /* ACCESSOR use-site */ access$internalAndPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-internal inline fun inlineInternalAndInternalPA1(): String
-    /* ACCESSOR use-site */ access$internalAndInternalPA$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-internal inline fun inlineInternalAndInternalPA2(): String
-    /* ACCESSOR use-site */ access$internalAndInternalPA$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-public inline fun inlineOnlyPublic1(): String
-    /* ACCESSOR use-site */ access$onlyPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-public inline fun inlineOnlyPublic2(): String
-    /* ACCESSOR use-site */ access$onlyPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-internal inline fun inlineOnlyInternalPA1(): String
-    /* ACCESSOR use-site */ access$onlyInternalPA$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-internal inline fun inlineOnlyInternalPA2(): String
-    /* ACCESSOR use-site */ access$onlyInternalPA$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-public inline fun inlineAllEffectivelyPublic1(): String
-    /* ACCESSOR use-site */ access$allEffectivelyPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-internal inline fun inlineAllEffectivelyPublic2(): String
-    /* ACCESSOR use-site */ access$allEffectivelyPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt()
-/* ACCESSOR declaration */ public fun access$onlyInternal$tUsePrivateTopLevelFunWithDifferentVisibilityKt(): String
-    /* TARGET use-site */ onlyInternal()
-/* ACCESSOR declaration */ public fun access$internalAndPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt(): String
-    /* TARGET use-site */ internalAndPublic()
-/* ACCESSOR declaration */ public fun access$internalAndInternalPA$tUsePrivateTopLevelFunWithDifferentVisibilityKt(): String
-    /* TARGET use-site */ internalAndInternalPA()
-/* ACCESSOR declaration */ public fun access$onlyPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt(): String
-    /* TARGET use-site */ onlyPublic()
-/* ACCESSOR declaration */ public fun access$onlyInternalPA$tUsePrivateTopLevelFunWithDifferentVisibilityKt(): String
-    /* TARGET use-site */ onlyInternalPA()
-/* ACCESSOR declaration */ public fun access$allEffectivelyPublic$tUsePrivateTopLevelFunWithDifferentVisibilityKt(): String
-    /* TARGET use-site */ allEffectivelyPublic()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineFun.accessors.txt
deleted file mode 100644
index a903097..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelSetterFromInternalInlineFun.kt */
-
-public var privateSetterVarA: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarA>(<set-?>: Int)
-public var privateSetterVarB: Int
-    /* TARGET declaration */ private fun <set-privateSetterVarB>(value: Int)
-internal inline fun customSetVarA(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarA>$tUsePrivateTopLevelSetterFromInternalInlineFunKt(<set-?> = value)
-internal inline fun customSetVarB(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarB>$tUsePrivateTopLevelSetterFromInternalInlineFunKt(value = value)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<set-privateSetterVarA>$tUsePrivateTopLevelSetterFromInternalInlineFunKt(<set-?> = value)
-    /* ACCESSOR use-site */ access$<set-privateSetterVarB>$tUsePrivateTopLevelSetterFromInternalInlineFunKt(value = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarA>$tUsePrivateTopLevelSetterFromInternalInlineFunKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVarA>(<set-?> = <set-?>)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVarB>$tUsePrivateTopLevelSetterFromInternalInlineFunKt(value: Int)
-    /* TARGET use-site */ <set-privateSetterVarB>(value = value)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineVar.accessors.txt
deleted file mode 100644
index 61f4765..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineVar.accessors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelSetterFromInternalInlineVar.kt */
-
-public var privateSetterVar: Int
-    /* TARGET declaration */ private fun <set-privateSetterVar>(<set-?>: Int)
-internal var inlineVar: Int
-    internal inline fun <set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateSetterVar>$tUsePrivateTopLevelSetterFromInternalInlineVarKt(<set-?> = value)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<set-privateSetterVar>$tUsePrivateTopLevelSetterFromInternalInlineVarKt(<set-?> = value)
-/* ACCESSOR declaration */ public fun access$<set-privateSetterVar>$tUsePrivateTopLevelSetterFromInternalInlineVarKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateSetterVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSuspendFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSuspendFun.accessors.txt
deleted file mode 100644
index f6e3c2c..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSuspendFun.accessors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelSuspendFun.kt */
-
-/* TARGET declaration */ private suspend fun privateSuspendMethod(): String
-internal suspend inline fun internalInline(): String
-    /* ACCESSOR use-site */ access$privateSuspendMethod$tUsePrivateTopLevelSuspendFunKt()
-public fun box(): String
-    local suspend fun <anonymous>(): String
-        /* ACCESSOR use-site */ access$privateSuspendMethod$tUsePrivateTopLevelSuspendFunKt()
-/* ACCESSOR declaration */ public suspend fun access$privateSuspendMethod$tUsePrivateTopLevelSuspendFunKt(): String
-    /* TARGET use-site */ privateSuspendMethod()
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineFun.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineFun.accessors.txt
deleted file mode 100644
index f583fed..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineFun.accessors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelVarFromInternalInlineFun.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal inline fun customSetVar(value: Int)
-    /* ACCESSOR use-site */ access$<set-privateVar>$tUsePrivateTopLevelVarFromInternalInlineFunKt(<set-?> = value)
-internal inline fun customGetVar(): Int
-    /* ACCESSOR use-site */ access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineFunKt()
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineFunKt()
-    /* ACCESSOR use-site */ access$<set-privateVar>$tUsePrivateTopLevelVarFromInternalInlineFunKt(<set-?> = value)
-    /* ACCESSOR use-site */ access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineFunKt()
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineFunKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tUsePrivateTopLevelVarFromInternalInlineFunKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineVar.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineVar.accessors.txt
deleted file mode 100644
index 44d4798..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineVar.accessors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=usePrivateTopLevelVarFromInternalInlineVar.kt */
-
-private var privateVar: Int
-    /* TARGET declaration */ private fun <get-privateVar>(): Int
-    /* TARGET declaration */ private fun <set-privateVar>(<set-?>: Int)
-internal var inlineVar: Int
-    internal inline fun <get-inlineVar>(): Int
-        /* ACCESSOR use-site */ access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineVarKt()
-    internal inline fun <set-inlineVar>(value: Int)
-        /* ACCESSOR use-site */ access$<set-privateVar>$tUsePrivateTopLevelVarFromInternalInlineVarKt(<set-?> = value)
-public fun box(): String
-    /* ACCESSOR use-site */ access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineVarKt()
-    /* ACCESSOR use-site */ access$<set-privateVar>$tUsePrivateTopLevelVarFromInternalInlineVarKt(<set-?> = value)
-    /* ACCESSOR use-site */ access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineVarKt()
-/* ACCESSOR declaration */ public fun access$<get-privateVar>$tUsePrivateTopLevelVarFromInternalInlineVarKt(): Int
-    /* TARGET use-site */ <get-privateVar>()
-/* ACCESSOR declaration */ public fun access$<set-privateVar>$tUsePrivateTopLevelVarFromInternalInlineVarKt(<set-?>: Int)
-    /* TARGET use-site */ <set-privateVar>(<set-?> = <set-?>)
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SyntheticAccessorsDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SyntheticAccessorsDumpHandler.kt
index f75f767..b1d2eb1 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SyntheticAccessorsDumpHandler.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SyntheticAccessorsDumpHandler.kt
@@ -5,14 +5,10 @@
 
 package org.jetbrains.kotlin.test.backend.handlers
 
-import com.intellij.openapi.util.io.FileUtil.loadFile
-import org.jetbrains.kotlin.config.KlibConfigurationKeys
 import org.jetbrains.kotlin.ir.inline.DumpSyntheticAccessors
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.test.Assertions
-import org.jetbrains.kotlin.test.InTextDirectivesUtils.isDirectiveDefined
 import org.jetbrains.kotlin.test.directives.KlibIrInlinerTestDirectives
-import org.jetbrains.kotlin.test.directives.KlibIrInlinerTestDirectives.IDENTICAL_KLIB_SYNTHETIC_ACCESSOR_DUMPS
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.model.*
 import org.jetbrains.kotlin.test.services.*
@@ -37,7 +33,6 @@
 
         val configuration = testServices.compilerConfigurationProvider.getCompilerConfiguration(testModules.first())
         val dumpDir = DumpSyntheticAccessors.getDumpDirectoryOrNull(configuration) ?: return
-        val withNarrowedVisibility = configuration.getBoolean(KlibConfigurationKeys.SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY)
 
         val uniqueIrModuleNames = testModules.mapNotNull { testModule ->
             testServices.dependencyProvider.getArtifactSafe(testModule, BackendKinds.IrBackend)?.irModuleFragment?.name
@@ -47,7 +42,6 @@
             dumpDir = dumpDir,
             moduleNames = uniqueIrModuleNames,
             testDataFile = testServices.moduleStructure.originalTestDataFiles.first(),
-            withNarrowedVisibility
         )
     }
 
@@ -56,7 +50,6 @@
             dumpDir: File,
             moduleNames: Set<Name>,
             testDataFile: File,
-            withNarrowedVisibility: Boolean
         ) {
             val irModuleDumps = moduleNames.mapNotNull { moduleName ->
                 val moduleDumpFile = DumpSyntheticAccessors.getDumpFileForModule(dumpDir, moduleName)
@@ -76,58 +69,20 @@
                 }
             }
 
-            val expectedDumpFile = if (withNarrowedVisibility) {
-                val normalDumpFile = dumpFile(testDataFile, false)
-                val narrowedDumpFile = dumpFile(testDataFile, true)
-
-                checkDumpFilesAndChooseOne(testDataFile, normalDumpFile, narrowedDumpFile)
-            } else {
-                dumpFile(testDataFile, false)
-            }
-
+            val expectedDumpFile = dumpFile(testDataFile)
             assertEqualsToFile(expectedDumpFile, actualDump)
         }
 
-        private fun dumpFile(testDataFile: File, withNarrowedVisibility: Boolean): File {
+        private fun dumpFile(testDataFile: File): File {
             val dumpFileName = buildString {
                 append(testDataFile.nameWithoutExtension)
                 append(".accessors")
-                if (withNarrowedVisibility) append("-narrowed")
+                append("-narrowed")
                 append(".txt")
             }
 
             return testDataFile.resolveSibling(dumpFileName)
         }
-
-        private fun Assertions.checkDumpFilesAndChooseOne(testDataFile: File, normalDumpFile: File, narrowedDumpFile: File): File {
-            val shouldBeIdenticalDumps = isDirectiveDefined(loadFile(testDataFile), IDENTICAL_KLIB_SYNTHETIC_ACCESSOR_DUMPS.name)
-
-            if (normalDumpFile.exists() && narrowedDumpFile.exists()) {
-                val identicalDumps = normalDumpFile.readText().trimEnd() == narrowedDumpFile.readText().trimEnd()
-
-                fun fail(problem: String, actions: String): Nothing = fail { "$problem\n$actions\n" }
-
-                if (identicalDumps) {
-                    if (shouldBeIdenticalDumps)
-                        fail(
-                            "The synthetic accessor dumps are identical.",
-                            "Please remove the .accessors-narrowed.txt file."
-                        )
-                    else
-                        fail(
-                            "The synthetic accessor dumps are identical.",
-                            "Please remove the .accessors-narrowed.txt file and add the IDENTICAL_KLIB_SYNTHETIC_ACCESSOR_DUMPS directive to the test data file."
-                        )
-                } else if (shouldBeIdenticalDumps) {
-                    fail(
-                        "The synthetic accessor dumps differ.",
-                        "Please remove the IDENTICAL_KLIB_SYNTHETIC_ACCESSOR_DUMPS directive from the test data file."
-                    )
-                }
-            }
-
-            return if (shouldBeIdenticalDumps) normalDumpFile else narrowedDumpFile
-        }
     }
 }
 
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/KlibIrInlinerTestDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/KlibIrInlinerTestDirectives.kt
index 2d96910..4cfbf2b 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/KlibIrInlinerTestDirectives.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/KlibIrInlinerTestDirectives.kt
@@ -22,14 +22,6 @@
         """.trimIndent()
     )
 
-    val KLIB_SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY by directive(
-        """
-            Narrow the visibility of generated synthetic accessors to _internal_" +
-            if such accessors are only used in inline functions that are not a part of public ABI
-            Equivalent to passing the '-Xsynthetic-accessors-with-narrowed-visibility' CLI flag.
-        """.trimIndent()
-    )
-
     val DUMP_KLIB_SYNTHETIC_ACCESSORS by directive(
         """
             Enable dumping synthetic accessors and their use-sites immediately generation.
@@ -38,15 +30,6 @@
         """.trimIndent()
     )
 
-    val IDENTICAL_KLIB_SYNTHETIC_ACCESSOR_DUMPS by directive(
-        """
-            Normally, there should be different dumps of synthetic accessors generated with and without
-            narrowing visibility (see $KLIB_SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY directive
-            for details). But sometimes these dumps are identical. In such cases with this directive
-            it's possible to have just one dump file.
-        """.trimIndent()
-    )
-
     val SKIP_UNBOUND_IR_SERIALIZATION by directive(
         """
             This is a directive to skip some test data files in unbound IR serialization tests.
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
index 710f40f..9bf9b76 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
@@ -27,7 +27,6 @@
 import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.SOURCE_MAP_EMBED_SOURCES
 import org.jetbrains.kotlin.test.directives.KlibIrInlinerTestDirectives
 import org.jetbrains.kotlin.test.directives.KlibIrInlinerTestDirectives.DUMP_KLIB_SYNTHETIC_ACCESSORS
-import org.jetbrains.kotlin.test.directives.KlibIrInlinerTestDirectives.KLIB_SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
 import org.jetbrains.kotlin.test.model.*
@@ -248,11 +247,6 @@
                 testServices.getOrCreateTempDirectory("synthetic-accessors").absolutePath
             )
         }
-
-        configuration.put(
-            KlibConfigurationKeys.SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY,
-            KLIB_SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY in registeredDirectives
-        )
     }
 }
 
diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
index 0e66fd5..741062c 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
@@ -60,9 +60,6 @@
             testClass<AbstractFirJsKlibSyntheticAccessorInPhase1Test> {
                 model()
             }
-            testClass<AbstractFirJsKlibSyntheticAccessorInPhase2Test> {
-                model()
-            }
             testClass<AbstractFirJsCodegenBoxWithInlinedFunInKlibTest>(
                 suiteTestClassName = "FirJsKlibSyntheticAccessorsBoxTestGenerated"
             ) {
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt
index 5de7e1d..a015fe4 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt
@@ -234,7 +234,6 @@
 
 // TODO(KT-64570): Don't inherit from AbstractFirJsTest after we move the common prefix of lowerings before serialization.
 abstract class AbstractFirJsKlibSyntheticAccessorTest(
-    private val narrowedAccessorVisibility: Boolean,
     testGroupOutputDirPrefix: String
 ) : AbstractFirJsTest(
     pathToTestDir = "compiler/testData/klib/syntheticAccessors/",
@@ -245,17 +244,10 @@
         defaultDirectives {
             +KlibIrInlinerTestDirectives.ENABLE_IR_VISIBILITY_CHECKS_AFTER_INLINING
             +KlibIrInlinerTestDirectives.DUMP_KLIB_SYNTHETIC_ACCESSORS
-            if (narrowedAccessorVisibility) +KlibIrInlinerTestDirectives.KLIB_SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY
         }
     }
 }
 
 open class AbstractFirJsKlibSyntheticAccessorInPhase1Test : AbstractFirJsKlibSyntheticAccessorTest(
-    narrowedAccessorVisibility = true,
     testGroupOutputDirPrefix = "klib/syntheticAccessors-k2/phase1",
 )
-
-open class AbstractFirJsKlibSyntheticAccessorInPhase2Test : AbstractFirJsKlibSyntheticAccessorTest(
-    narrowedAccessorVisibility = false,
-    testGroupOutputDirPrefix = "klib/syntheticAccessors-k2/phase2",
-)
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsKlibSyntheticAccessorInPhase2TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsKlibSyntheticAccessorInPhase2TestGenerated.java
deleted file mode 100644
index 01b9c18..0000000
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsKlibSyntheticAccessorInPhase2TestGenerated.java
+++ /dev/null
@@ -1,1521 +0,0 @@
-/*
- * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.js.test.fir;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/klib/syntheticAccessors")
-@TestDataPath("$PROJECT_ROOT")
-public class FirJsKlibSyntheticAccessorInPhase2TestGenerated extends AbstractFirJsKlibSyntheticAccessorInPhase2Test {
-  @Test
-  public void testAllFilesPresentInSyntheticAccessors() {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-  }
-
-  @Nested
-  @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis")
-  @TestDataPath("$PROJECT_ROOT")
-  public class OuterThis {
-    @Test
-    public void testAllFilesPresentInOuterThis() {
-      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    public class CrossFileLeak {
-      @Test
-      public void testAllFilesPresentInCrossFileLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughInnerClass.kt")
-      public void testLeakingCompanionPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughNestedClass.kt")
-      public void testLeakingCompanionPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClass.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughNestedClass.kt")
-      public void testLeakingOuterPrivateMethodThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughInnerClass.kt")
-      public void testLeakingOuterPrivateVarThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughNestedClass.kt")
-      public void testLeakingOuterPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThis.kt")
-      public void testLeakingOuterThis() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThis.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThisWithTypeParameters.kt")
-      public void testLeakingOuterThisWithTypeParameters() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    public class CrossModuleLeak {
-      @Test
-      public void testAllFilesPresentInCrossModuleLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughInnerClass.kt")
-      public void testLeakingCompanionPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughNestedClass.kt")
-      public void testLeakingCompanionPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClass.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughNestedClass.kt")
-      public void testLeakingOuterPrivateMethodThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughInnerClass.kt")
-      public void testLeakingOuterPrivateVarThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughNestedClass.kt")
-      public void testLeakingOuterPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThis.kt")
-      public void testLeakingOuterThis() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThis.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThisWithTypeParameters.kt")
-      public void testLeakingOuterThisWithTypeParameters() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis/singleFile")
-    @TestDataPath("$PROJECT_ROOT")
-    public class SingleFile {
-      @Test
-      public void testAllFilesPresentInSingleFile() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis/singleFile"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughInnerClass.kt")
-      public void testLeakingCompanionPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughNestedClass.kt")
-      public void testLeakingCompanionPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClass.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughNestedClass.kt")
-      public void testLeakingOuterPrivateMethodThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughInnerClass.kt")
-      public void testLeakingOuterPrivateVarThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughNestedClass.kt")
-      public void testLeakingOuterPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThisWithTypeParameters.kt")
-      public void testLeakingOuterThisWithTypeParameters() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("outerThisUsage.kt")
-      public void testOuterThisUsage() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/outerThisUsage.kt");
-      }
-    }
-  }
-
-  @Nested
-  @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember")
-  @TestDataPath("$PROJECT_ROOT")
-  public class PrivateMember {
-    @Test
-    public void testAllFilesPresentInPrivateMember() {
-      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    public class CrossFilePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossFilePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethod.kt")
-      public void testLeakingCompanionPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt")
-      public void testLeakingCompanionPrivateMethodThroughTopLevelInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateCompanionThroughInternalInlineFun.kt")
-      public void testLeakingPrivateCompanionThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateCompanionThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughInternalInlineFun.kt")
-      public void testLeakingPrivateConstructorThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorWithTypeParameter.kt")
-      public void testLeakingPrivateConstructorWithTypeParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorWithTypeParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionMember.kt")
-      public void testLeakingPrivateExtensionMember() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionMember.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateInnerClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateInnerClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateInnerClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethod.kt")
-      public void testLeakingPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromDefaultArguments.kt")
-      public void testLeakingPrivateMethodFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClass.kt")
-      public void testLeakingPrivateMethodInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInInnerClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClass.kt")
-      public void testLeakingPrivateMethodInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInNestedClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughEffectivelyInternalInline.kt")
-      public void testLeakingPrivateMethodThroughEffectivelyInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedClass.kt")
-      public void testLeakingPrivateMethodThroughInheritedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedCompanion.kt")
-      public void testLeakingPrivateMethodThroughInheritedCompanion() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt")
-      public void testLeakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateMethodThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughReference.kt")
-      public void testLeakingPrivateMethodThroughReference() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughReference.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodWithDifferentVisibility.kt")
-      public void testLeakingPrivateMethodWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateNestedClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateNestedClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateNestedClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateOperatorMethod.kt")
-      public void testLeakingPrivateOperatorMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateOperatorMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineFun.kt")
-      public void testLeakingPrivateSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineVar.kt")
-      public void testLeakingPrivateSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFun.kt")
-      public void testLeakingPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineVar.kt")
-      public void testLeakingPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInInternalInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughReferenceInInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInPublicInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInPublicInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughReferenceInPublicInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt")
-      public void testLeakingSeveralPrivateConstructorsThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstValFromInternalInline.kt")
-      public void testUsePrivateConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    public class CrossModulePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossModulePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethod.kt")
-      public void testLeakingCompanionPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt")
-      public void testLeakingCompanionPrivateMethodThroughTopLevelInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateCompanionThroughInternalInlineFun.kt")
-      public void testLeakingPrivateCompanionThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateCompanionThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughInternalInlineFun.kt")
-      public void testLeakingPrivateConstructorThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorWithTypeParameter.kt")
-      public void testLeakingPrivateConstructorWithTypeParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorWithTypeParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionMember.kt")
-      public void testLeakingPrivateExtensionMember() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionMember.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateInnerClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateInnerClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateInnerClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethod.kt")
-      public void testLeakingPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromDefaultArguments.kt")
-      public void testLeakingPrivateMethodFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClass.kt")
-      public void testLeakingPrivateMethodInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInInnerClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClass.kt")
-      public void testLeakingPrivateMethodInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInNestedClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughEffectivelyInternalInline.kt")
-      public void testLeakingPrivateMethodThroughEffectivelyInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedClass.kt")
-      public void testLeakingPrivateMethodThroughInheritedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedCompanion.kt")
-      public void testLeakingPrivateMethodThroughInheritedCompanion() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt")
-      public void testLeakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateMethodThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughReference.kt")
-      public void testLeakingPrivateMethodThroughReference() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughReference.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodWithDifferentVisibility.kt")
-      public void testLeakingPrivateMethodWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateNestedClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateNestedClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateNestedClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateOperatorMethod.kt")
-      public void testLeakingPrivateOperatorMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateOperatorMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineFun.kt")
-      public void testLeakingPrivateSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineVar.kt")
-      public void testLeakingPrivateSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFun.kt")
-      public void testLeakingPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineVar.kt")
-      public void testLeakingPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInInternalInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughReferenceInInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInPublicInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInPublicInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughReferenceInPublicInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt")
-      public void testLeakingSeveralPrivateConstructorsThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstValFromInternalInline.kt")
-      public void testUsePrivateConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember/singleFile")
-    @TestDataPath("$PROJECT_ROOT")
-    public class SingleFile {
-      @Test
-      public void testAllFilesPresentInSingleFile() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember/singleFile"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughEffectivelyInternalInline.kt")
-      public void testLeakingPrivateMethodThroughEffectivelyInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughEffectivelyInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughReference.kt")
-      public void testLeakingPrivateMethodThroughReference() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodWithDifferentVisibility.kt")
-      public void testLeakingPrivateMethodWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("useCompanionPrivateMethodFromInternalInline.kt")
-      public void testUseCompanionPrivateMethodFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useCompanionPrivateMethodFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("useLateinitIsInitializedFromInternalInline.kt")
-      public void testUseLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateClassConstructor.kt")
-      public void testUsePrivateClassConstructor() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateClassConstructor.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateCompanionThroughInternalInlineFun.kt")
-      public void testUsePrivateCompanionThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateCompanionThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstructorFromInternalInline.kt")
-      public void testUsePrivateConstructorFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstructorWithTypeParameter.kt")
-      public void testUsePrivateConstructorWithTypeParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorWithTypeParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateExtensionFromInternalInline.kt")
-      public void testUsePrivateExtensionFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateExtensionFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateFunInterfaceFromInternalFun.kt")
-      public void testUsePrivateFunInterfaceFromInternalFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateFunInterfaceFromInternalFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateInnerClassThroughInternalInlineFun.kt")
-      public void testUsePrivateInnerClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateInnerClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromDefaultArguments.kt")
-      public void testUsePrivateMethodFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromInternalInline.kt")
-      public void testUsePrivateMethodFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromLocalObjectInsideInternalInline.kt")
-      public void testUsePrivateMethodFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt")
-      public void testUsePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt")
-      public void testUsePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt")
-      public void testUsePrivateMethodThroughInlineMethodInLocalObjectInPublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateNestedClassThroughInternalInlineFun.kt")
-      public void testUsePrivateNestedClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateNestedClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateOperatorMethod.kt")
-      public void testUsePrivateOperatorMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateOperatorMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateSetterFromInternalInlineFun.kt")
-      public void testUsePrivateSetterFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateSetterFromInternalInlineVar.kt")
-      public void testUsePrivateSetterFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromInternalInlineFun.kt")
-      public void testUsePrivateVarFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromInternalInlineVar.kt")
-      public void testUsePrivateVarFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromReferenceInInternalInlineFun.kt")
-      public void testUsePrivateVarFromReferenceInInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromReferenceInPublicInlineFun.kt")
-      public void testUsePrivateVarFromReferenceInPublicInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInPublicInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("useSeveralPrivateConstructorsThroughInternalInlineFun.kt")
-      public void testUseSeveralPrivateConstructorsThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useSeveralPrivateConstructorsThroughInternalInlineFun.kt");
-      }
-    }
-  }
-
-  @Nested
-  @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate")
-  @TestDataPath("$PROJECT_ROOT")
-  public class TopLevelPrivate {
-    @Test
-    public void testAllFilesPresentInTopLevelPrivate() {
-      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    public class CrossFilePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossFilePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateClassFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateClassFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassThroughGenericType.kt")
-      public void testLeakingPrivateClassThroughGenericType() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateClassThroughGenericType.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFun.kt")
-      public void testLeakingPrivateTopLevelFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromDefaultArguments.kt")
-      public void testLeakingPrivateTopLevelFunFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunWithDifferentVisibility.kt")
-      public void testLeakingPrivateTopLevelFunWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelLateinitVar.kt")
-      public void testLeakingPrivateTopLevelLateinitVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelLateinitVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSuspendFun.kt")
-      public void testLeakingPrivateTopLevelSuspendFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSuspendFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingFunAccessors.kt")
-      public void testPotentiallyClashingFunAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingFunAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingVarAccessors.kt")
-      public void testPotentiallyClashingVarAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingVarAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelConstValFromInternalInline.kt")
-      public void testUsePrivateTopLevelConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/usePrivateTopLevelConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    public class CrossModulePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossModulePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateClassFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateClassFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassThroughGenericType.kt")
-      public void testLeakingPrivateClassThroughGenericType() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateClassThroughGenericType.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFun.kt")
-      public void testLeakingPrivateTopLevelFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromDefaultArguments.kt")
-      public void testLeakingPrivateTopLevelFunFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunWithDifferentVisibility.kt")
-      public void testLeakingPrivateTopLevelFunWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelLateinitVar.kt")
-      public void testLeakingPrivateTopLevelLateinitVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelLateinitVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSuspendFun.kt")
-      public void testLeakingPrivateTopLevelSuspendFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSuspendFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingFunAccessors.kt")
-      public void testPotentiallyClashingFunAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingFunAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingVarAccessors.kt")
-      public void testPotentiallyClashingVarAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingVarAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelConstValFromInternalInline.kt")
-      public void testUsePrivateTopLevelConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/usePrivateTopLevelConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile")
-    @TestDataPath("$PROJECT_ROOT")
-    public class SingleFile {
-      @Test
-      public void testAllFilesPresentInSingleFile() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelLateinitVar.kt")
-      public void testLeakingPrivateTopLevelLateinitVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateTopLevelLateinitVar.kt");
-      }
-
-      @Test
-      @TestMetadata("useLateinitIsInitializedFromInternalInline.kt")
-      public void testUseLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/useLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateClassThroughGenericType.kt")
-      public void testUsePrivateClassThroughGenericType() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateClassThroughtPrivateTopLevelFun.kt")
-      public void testUsePrivateClassThroughtPrivateTopLevelFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughtPrivateTopLevelFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelExtensionFunFromInternalInline.kt")
-      public void testUsePrivateTopLevelExtensionFunFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelExtensionFunFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromDefaultArguments.kt")
-      public void testUsePrivateTopLevelFunFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromInternalInline.kt")
-      public void testUsePrivateTopLevelFunFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromLambdaInsideInternalInline.kt")
-      public void testUsePrivateTopLevelFunFromLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromLambdaInsidePublicInline.kt")
-      public void testUsePrivateTopLevelFunFromLambdaInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.kt")
-      public void testUsePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.kt")
-      public void testUsePrivateTopLevelFunInsidePublicInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunWithDifferentVisibility.kt")
-      public void testUsePrivateTopLevelFunWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelSetterFromInternalInlineFun.kt")
-      public void testUsePrivateTopLevelSetterFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelSetterFromInternalInlineVar.kt")
-      public void testUsePrivateTopLevelSetterFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelSuspendFun.kt")
-      public void testUsePrivateTopLevelSuspendFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSuspendFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelVarFromInternalInlineFun.kt")
-      public void testUsePrivateTopLevelVarFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelVarFromInternalInlineVar.kt")
-      public void testUsePrivateTopLevelVarFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineVar.kt");
-      }
-    }
-  }
-}
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt
index 1d8e4c0..d5b47ad 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanDriver.kt
@@ -214,7 +214,6 @@
             copy(KlibConfigurationKeys.KLIB_NORMALIZE_ABSOLUTE_PATH)
             copy(CLIConfigurationKeys.RENDER_DIAGNOSTIC_INTERNAL_NAME)
             copy(KlibConfigurationKeys.PRODUCE_KLIB_SIGNATURES_CLASH_CHECKS)
-            copy(KlibConfigurationKeys.SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY)
         }
 
         // For the second stage, remove already compiled source files from the configuration.
diff --git a/native/cli-native/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/native/cli-native/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
index eadabe0..7b7bd31 100644
--- a/native/cli-native/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
+++ b/native/cli-native/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
@@ -112,10 +112,6 @@
         configuration.put(KlibConfigurationKeys.NO_DOUBLE_INLINING, arguments.noDoubleInlining)
         arguments.dumpSyntheticAccessorsTo?.let { configuration.put(KlibConfigurationKeys.SYNTHETIC_ACCESSORS_DUMP_DIR, it) }
         configuration.put(
-            KlibConfigurationKeys.SYNTHETIC_ACCESSORS_WITH_NARROWED_VISIBILITY,
-            arguments.narrowedSyntheticAccessorsVisibility
-        )
-        configuration.put(
             KlibConfigurationKeys.DUPLICATED_UNIQUE_NAME_STRATEGY,
             DuplicatedUniqueNameStrategy.parseOrDefault(
                 arguments.duplicatedUniqueNameStrategy,
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibSyntheticAccessorInPhase2TestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibSyntheticAccessorInPhase2TestGenerated.java
deleted file mode 100644
index 47b9cc9..0000000
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibSyntheticAccessorInPhase2TestGenerated.java
+++ /dev/null
@@ -1,1591 +0,0 @@
-/*
- * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.konan.test.blackbox;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedProperty;
-import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty;
-import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseExtTestCaseGroupProvider;
-import org.junit.jupiter.api.Tag;
-import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline;
-import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/klib/syntheticAccessors")
-@TestDataPath("$PROJECT_ROOT")
-@EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-@EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-@UseExtTestCaseGroupProvider()
-@Tag("frontend-fir")
-@FirPipeline()
-public class NativeKlibSyntheticAccessorInPhase2TestGenerated extends AbstractNativeKlibSyntheticAccessorInPhase2Test {
-  @Test
-  public void testAllFilesPresentInSyntheticAccessors() {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-  }
-
-  @Nested
-  @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis")
-  @TestDataPath("$PROJECT_ROOT")
-  @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-  @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-  @UseExtTestCaseGroupProvider()
-  @Tag("frontend-fir")
-  @FirPipeline()
-  public class OuterThis {
-    @Test
-    public void testAllFilesPresentInOuterThis() {
-      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class CrossFileLeak {
-      @Test
-      public void testAllFilesPresentInCrossFileLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughInnerClass.kt")
-      public void testLeakingCompanionPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughNestedClass.kt")
-      public void testLeakingCompanionPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingCompanionPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClass.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughNestedClass.kt")
-      public void testLeakingOuterPrivateMethodThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateMethodThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughInnerClass.kt")
-      public void testLeakingOuterPrivateVarThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughNestedClass.kt")
-      public void testLeakingOuterPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThis.kt")
-      public void testLeakingOuterThis() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThis.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThisWithTypeParameters.kt")
-      public void testLeakingOuterThisWithTypeParameters() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class CrossModuleLeak {
-      @Test
-      public void testAllFilesPresentInCrossModuleLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughInnerClass.kt")
-      public void testLeakingCompanionPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughNestedClass.kt")
-      public void testLeakingCompanionPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingCompanionPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClass.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughNestedClass.kt")
-      public void testLeakingOuterPrivateMethodThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateMethodThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughInnerClass.kt")
-      public void testLeakingOuterPrivateVarThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughNestedClass.kt")
-      public void testLeakingOuterPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThis.kt")
-      public void testLeakingOuterThis() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThis.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThisWithTypeParameters.kt")
-      public void testLeakingOuterThisWithTypeParameters() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/outerThis/singleFile")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class SingleFile {
-      @Test
-      public void testAllFilesPresentInSingleFile() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/outerThis/singleFile"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughInnerClass.kt")
-      public void testLeakingCompanionPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughNestedClass.kt")
-      public void testLeakingCompanionPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingCompanionPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClass.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt")
-      public void testLeakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughInnerClassWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateMethodThroughNestedClass.kt")
-      public void testLeakingOuterPrivateMethodThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateMethodThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughInnerClass.kt")
-      public void testLeakingOuterPrivateVarThroughInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterPrivateVarThroughNestedClass.kt")
-      public void testLeakingOuterPrivateVarThroughNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterPrivateVarThroughNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingOuterThisWithTypeParameters.kt")
-      public void testLeakingOuterThisWithTypeParameters() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt")
-      public void testLeakingPrivateConstructorThroughPublicInlineFunInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingPrivateConstructorThroughPublicInlineFunInNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("outerThisUsage.kt")
-      public void testOuterThisUsage() {
-        runTest("compiler/testData/klib/syntheticAccessors/outerThis/singleFile/outerThisUsage.kt");
-      }
-    }
-  }
-
-  @Nested
-  @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember")
-  @TestDataPath("$PROJECT_ROOT")
-  @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-  @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-  @UseExtTestCaseGroupProvider()
-  @Tag("frontend-fir")
-  @FirPipeline()
-  public class PrivateMember {
-    @Test
-    public void testAllFilesPresentInPrivateMember() {
-      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class CrossFilePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossFilePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethod.kt")
-      public void testLeakingCompanionPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt")
-      public void testLeakingCompanionPrivateMethodThroughTopLevelInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateCompanionThroughInternalInlineFun.kt")
-      public void testLeakingPrivateCompanionThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateCompanionThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughInternalInlineFun.kt")
-      public void testLeakingPrivateConstructorThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorWithTypeParameter.kt")
-      public void testLeakingPrivateConstructorWithTypeParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorWithTypeParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionMember.kt")
-      public void testLeakingPrivateExtensionMember() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionMember.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateInnerClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateInnerClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateInnerClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethod.kt")
-      public void testLeakingPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromDefaultArguments.kt")
-      public void testLeakingPrivateMethodFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClass.kt")
-      public void testLeakingPrivateMethodInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInInnerClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClass.kt")
-      public void testLeakingPrivateMethodInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInNestedClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughEffectivelyInternalInline.kt")
-      public void testLeakingPrivateMethodThroughEffectivelyInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedClass.kt")
-      public void testLeakingPrivateMethodThroughInheritedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedCompanion.kt")
-      public void testLeakingPrivateMethodThroughInheritedCompanion() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt")
-      public void testLeakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateMethodThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughReference.kt")
-      public void testLeakingPrivateMethodThroughReference() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodThroughReference.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodWithDifferentVisibility.kt")
-      public void testLeakingPrivateMethodWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateMethodWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateNestedClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateNestedClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateNestedClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateOperatorMethod.kt")
-      public void testLeakingPrivateOperatorMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateOperatorMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineFun.kt")
-      public void testLeakingPrivateSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineVar.kt")
-      public void testLeakingPrivateSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFun.kt")
-      public void testLeakingPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineVar.kt")
-      public void testLeakingPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInInternalInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughReferenceInInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInPublicInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInPublicInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateVarThroughReferenceInPublicInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt")
-      public void testLeakingSeveralPrivateConstructorsThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstValFromInternalInline.kt")
-      public void testUsePrivateConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class CrossModulePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossModulePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethod.kt")
-      public void testLeakingCompanionPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt")
-      public void testLeakingCompanionPrivateMethodThroughTopLevelInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateMethodThroughTopLevelInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughCompanionInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughCompanionInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughCompanionInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineFun.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingCompanionPrivateVarThroughInlineVar.kt")
-      public void testLeakingCompanionPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingCompanionPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateCompanionThroughInternalInlineFun.kt")
-      public void testLeakingPrivateCompanionThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateCompanionThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorThroughInternalInlineFun.kt")
-      public void testLeakingPrivateConstructorThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateConstructorWithTypeParameter.kt")
-      public void testLeakingPrivateConstructorWithTypeParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorWithTypeParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionMember.kt")
-      public void testLeakingPrivateExtensionMember() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionMember.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateInnerClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateInnerClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateInnerClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethod.kt")
-      public void testLeakingPrivateMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromDefaultArguments.kt")
-      public void testLeakingPrivateMethodFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt")
-      public void testLeakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClass.kt")
-      public void testLeakingPrivateMethodInInnerClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInInnerClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInInnerClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClass.kt")
-      public void testLeakingPrivateMethodInNestedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt")
-      public void testLeakingPrivateMethodInNestedClassThroughtOuterInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodInNestedClassThroughtOuterInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughEffectivelyInternalInline.kt")
-      public void testLeakingPrivateMethodThroughEffectivelyInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughEffectivelyInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedClass.kt")
-      public void testLeakingPrivateMethodThroughInheritedClass() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedClass.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInheritedCompanion.kt")
-      public void testLeakingPrivateMethodThroughInheritedCompanion() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInheritedCompanion.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt")
-      public void testLeakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateMethodThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughReference.kt")
-      public void testLeakingPrivateMethodThroughReference() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodThroughReference.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodWithDifferentVisibility.kt")
-      public void testLeakingPrivateMethodWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateMethodWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateNestedClassThroughInternalInlineFun.kt")
-      public void testLeakingPrivateNestedClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateNestedClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateOperatorMethod.kt")
-      public void testLeakingPrivateOperatorMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateOperatorMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineFun.kt")
-      public void testLeakingPrivateSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughInlineVar.kt")
-      public void testLeakingPrivateSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateSetterThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateSetterThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateSetterThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFun.kt")
-      public void testLeakingPrivateVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughInlineVar.kt")
-      public void testLeakingPrivateVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInInternalInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughReferenceInInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateVarThroughReferenceInPublicInlineFun.kt")
-      public void testLeakingPrivateVarThroughReferenceInPublicInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateVarThroughReferenceInPublicInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt")
-      public void testLeakingSeveralPrivateConstructorsThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingSeveralPrivateConstructorsThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstValFromInternalInline.kt")
-      public void testUsePrivateConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/privateMember/singleFile")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class SingleFile {
-      @Test
-      public void testAllFilesPresentInSingleFile() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/privateMember/singleFile"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughEffectivelyInternalInline.kt")
-      public void testLeakingPrivateMethodThroughEffectivelyInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughEffectivelyInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodThroughReference.kt")
-      public void testLeakingPrivateMethodThroughReference() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodThroughReference.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateMethodWithDifferentVisibility.kt")
-      public void testLeakingPrivateMethodWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateMethodWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("useCompanionPrivateMethodFromInternalInline.kt")
-      public void testUseCompanionPrivateMethodFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useCompanionPrivateMethodFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("useLateinitIsInitializedFromInternalInline.kt")
-      public void testUseLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateClassConstructor.kt")
-      public void testUsePrivateClassConstructor() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateClassConstructor.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateCompanionThroughInternalInlineFun.kt")
-      public void testUsePrivateCompanionThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateCompanionThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstructorFromInternalInline.kt")
-      public void testUsePrivateConstructorFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateConstructorWithTypeParameter.kt")
-      public void testUsePrivateConstructorWithTypeParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateConstructorWithTypeParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateExtensionFromInternalInline.kt")
-      public void testUsePrivateExtensionFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateExtensionFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateFunInterfaceFromInternalFun.kt")
-      public void testUsePrivateFunInterfaceFromInternalFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateFunInterfaceFromInternalFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateInnerClassThroughInternalInlineFun.kt")
-      public void testUsePrivateInnerClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateInnerClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromDefaultArguments.kt")
-      public void testUsePrivateMethodFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromInternalInline.kt")
-      public void testUsePrivateMethodFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromLocalObjectInsideInternalInline.kt")
-      public void testUsePrivateMethodFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt")
-      public void testUsePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt")
-      public void testUsePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromLocalObjectWithCrossinlineUsageInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt")
-      public void testUsePrivateMethodThroughInlineMethodInLocalObjectInPublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodThroughInlineMethodInLocalObjectInPublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateNestedClassThroughInternalInlineFun.kt")
-      public void testUsePrivateNestedClassThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateNestedClassThroughInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateOperatorMethod.kt")
-      public void testUsePrivateOperatorMethod() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateOperatorMethod.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateSetterFromInternalInlineFun.kt")
-      public void testUsePrivateSetterFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateSetterFromInternalInlineVar.kt")
-      public void testUsePrivateSetterFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateSetterFromInternalInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromInternalInlineFun.kt")
-      public void testUsePrivateVarFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromInternalInlineVar.kt")
-      public void testUsePrivateVarFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromInternalInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromReferenceInInternalInlineFun.kt")
-      public void testUsePrivateVarFromReferenceInInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateVarFromReferenceInPublicInlineFun.kt")
-      public void testUsePrivateVarFromReferenceInPublicInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateVarFromReferenceInPublicInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("useSeveralPrivateConstructorsThroughInternalInlineFun.kt")
-      public void testUseSeveralPrivateConstructorsThroughInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/privateMember/singleFile/useSeveralPrivateConstructorsThroughInternalInlineFun.kt");
-      }
-    }
-  }
-
-  @Nested
-  @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate")
-  @TestDataPath("$PROJECT_ROOT")
-  @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-  @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-  @UseExtTestCaseGroupProvider()
-  @Tag("frontend-fir")
-  @FirPipeline()
-  public class TopLevelPrivate {
-    @Test
-    public void testAllFilesPresentInTopLevelPrivate() {
-      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class CrossFilePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossFilePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateClassFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateClassFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassThroughGenericType.kt")
-      public void testLeakingPrivateClassThroughGenericType() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateClassThroughGenericType.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFun.kt")
-      public void testLeakingPrivateTopLevelFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromDefaultArguments.kt")
-      public void testLeakingPrivateTopLevelFunFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunWithDifferentVisibility.kt")
-      public void testLeakingPrivateTopLevelFunWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelLateinitVar.kt")
-      public void testLeakingPrivateTopLevelLateinitVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelLateinitVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSuspendFun.kt")
-      public void testLeakingPrivateTopLevelSuspendFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelSuspendFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingFunAccessors.kt")
-      public void testPotentiallyClashingFunAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingFunAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingVarAccessors.kt")
-      public void testPotentiallyClashingVarAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/potentiallyClashingVarAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelConstValFromInternalInline.kt")
-      public void testUsePrivateTopLevelConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/usePrivateTopLevelConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class CrossModulePrivateLeak {
-      @Test
-      public void testAllFilesPresentInCrossModulePrivateLeak() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingLateinitIsInitializedFromInternalInline.kt")
-      public void testLeakingLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassFromLocalObjectInsideInternalInline.kt")
-      public void testLeakingPrivateClassFromLocalObjectInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateClassFromLocalObjectInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateClassThroughGenericType.kt")
-      public void testLeakingPrivateClassThroughGenericType() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateClassThroughGenericType.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFun.kt")
-      public void testLeakingPrivateExtensionFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionFunThroughPrivateInlineChain.kt")
-      public void testLeakingPrivateExtensionFunThroughPrivateInlineChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionFunThroughPrivateInlineChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughInlineFun.kt")
-      public void testLeakingPrivateExtensionVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingPrivateExtensionVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateExtensionVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFun.kt")
-      public void testLeakingPrivateTopLevelFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromDefaultArguments.kt")
-      public void testLeakingPrivateTopLevelFunFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt")
-      public void testLeakingPrivateTopLevelFunFromLambdaInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunFromLambdaInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPrivateInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt")
-      public void testLeakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunThroughPublicInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelFunWithDifferentVisibility.kt")
-      public void testLeakingPrivateTopLevelFunWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelFunWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelLateinitVar.kt")
-      public void testLeakingPrivateTopLevelLateinitVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelLateinitVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSetterThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelSetterThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSetterThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelSuspendFun.kt")
-      public void testLeakingPrivateTopLevelSuspendFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelSuspendFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFun.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineFunParameter.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineFunParameter() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineFunParameter.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelVarThroughInlineVar.kt")
-      public void testLeakingPrivateTopLevelVarThroughInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateTopLevelVarThroughInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateSetterThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateSetterThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineFunChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineFunChain.kt");
-      }
-
-      @Test
-      @TestMetadata("leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt")
-      public void testLeakingTopLevelPrivateVarThroughPrivateInlineVarChain() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingTopLevelPrivateVarThroughPrivateInlineVarChain.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingFunAccessors.kt")
-      public void testPotentiallyClashingFunAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingFunAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("potentiallyClashingVarAccessors.kt")
-      public void testPotentiallyClashingVarAccessors() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/potentiallyClashingVarAccessors.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelConstValFromInternalInline.kt")
-      public void testUsePrivateTopLevelConstValFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/usePrivateTopLevelConstValFromInternalInline.kt");
-      }
-    }
-
-    @Nested
-    @TestMetadata("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile")
-    @TestDataPath("$PROJECT_ROOT")
-    @EnforcedProperty(property = ClassLevelProperty.TEST_KIND, propertyValue = "STANDALONE")
-    @EnforcedProperty(property = ClassLevelProperty.CACHE_MODE, propertyValue = "NO")
-    @UseExtTestCaseGroupProvider()
-    @Tag("frontend-fir")
-    @FirPipeline()
-    public class SingleFile {
-      @Test
-      public void testAllFilesPresentInSingleFile() {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-      }
-
-      @Test
-      @TestMetadata("leakingPrivateTopLevelLateinitVar.kt")
-      public void testLeakingPrivateTopLevelLateinitVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateTopLevelLateinitVar.kt");
-      }
-
-      @Test
-      @TestMetadata("useLateinitIsInitializedFromInternalInline.kt")
-      public void testUseLateinitIsInitializedFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/useLateinitIsInitializedFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateClassThroughGenericType.kt")
-      public void testUsePrivateClassThroughGenericType() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughGenericType.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateClassThroughtPrivateTopLevelFun.kt")
-      public void testUsePrivateClassThroughtPrivateTopLevelFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateClassThroughtPrivateTopLevelFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelExtensionFunFromInternalInline.kt")
-      public void testUsePrivateTopLevelExtensionFunFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelExtensionFunFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromDefaultArguments.kt")
-      public void testUsePrivateTopLevelFunFromDefaultArguments() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromDefaultArguments.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromInternalInline.kt")
-      public void testUsePrivateTopLevelFunFromInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromLambdaInsideInternalInline.kt")
-      public void testUsePrivateTopLevelFunFromLambdaInsideInternalInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsideInternalInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunFromLambdaInsidePublicInline.kt")
-      public void testUsePrivateTopLevelFunFromLambdaInsidePublicInline() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunFromLambdaInsidePublicInline.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.kt")
-      public void testUsePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePrivateInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.kt")
-      public void testUsePrivateTopLevelFunInsidePublicInlineMethodInLocalObject() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunInsidePublicInlineMethodInLocalObject.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelFunWithDifferentVisibility.kt")
-      public void testUsePrivateTopLevelFunWithDifferentVisibility() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelFunWithDifferentVisibility.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelSetterFromInternalInlineFun.kt")
-      public void testUsePrivateTopLevelSetterFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelSetterFromInternalInlineVar.kt")
-      public void testUsePrivateTopLevelSetterFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSetterFromInternalInlineVar.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelSuspendFun.kt")
-      public void testUsePrivateTopLevelSuspendFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelSuspendFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelVarFromInternalInlineFun.kt")
-      public void testUsePrivateTopLevelVarFromInternalInlineFun() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineFun.kt");
-      }
-
-      @Test
-      @TestMetadata("usePrivateTopLevelVarFromInternalInlineVar.kt")
-      public void testUsePrivateTopLevelVarFromInternalInlineVar() {
-        runTest("compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/usePrivateTopLevelVarFromInternalInlineVar.kt");
-      }
-    }
-  }
-}
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
index 3e00724..3f86d0e 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
@@ -217,14 +217,6 @@
             ) {
                 model(targetBackend = TargetBackend.NATIVE)
             }
-            testClass<AbstractNativeKlibSyntheticAccessorInPhase2Test>(
-                annotations = listOf(
-                    *klibSyntheticAccessors(),
-                    *frontendFir(),
-                )
-            ) {
-                model(targetBackend = TargetBackend.NATIVE)
-            }
         }
 
         testGroup("native/native.tests/klib-ir-inliner/tests-gen", "compiler/testData/klib/syntheticAccessors") {
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibSyntheticAccessorTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibSyntheticAccessorTest.kt
index f2de8af..2c3b0b6 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibSyntheticAccessorTest.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibSyntheticAccessorTest.kt
@@ -38,7 +38,6 @@
 //        )
 @ExtendWith(KlibSyntheticAccessorTestSupport::class)
 abstract class AbstractNativeKlibSyntheticAccessorTest(
-    internal val narrowedAccessorVisibility: Boolean
 ) : ExternalSourceTransformersProvider {
     lateinit var testRunSettings: TestRunSettings
     lateinit var testRunProvider: TestRunProvider
@@ -84,7 +83,6 @@
                     dumpDir = syntheticAccessorsDumpDir,
                     moduleNames = testRun.testCase.modules.mapToSet { Name.identifier(it.name) },
                     testDataFile = absoluteTestFile,
-                    withNarrowedVisibility = narrowedAccessorVisibility
                 )
             }
         }.exceptionOrNull()?.let { exception ->
@@ -103,5 +101,4 @@
     final override fun getSourceTransformers(testDataFile: File): ExternalSourceTransformers? = null
 }
 
-open class AbstractNativeKlibSyntheticAccessorInPhase1Test : AbstractNativeKlibSyntheticAccessorTest(narrowedAccessorVisibility = true)
-open class AbstractNativeKlibSyntheticAccessorInPhase2Test : AbstractNativeKlibSyntheticAccessorTest(narrowedAccessorVisibility = false)
+open class AbstractNativeKlibSyntheticAccessorInPhase1Test : AbstractNativeKlibSyntheticAccessorTest()
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NativeTestSupport.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NativeTestSupport.kt
index 4a64d66..b8b006e 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NativeTestSupport.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NativeTestSupport.kt
@@ -100,9 +100,6 @@
 
                     // Enable double-inlining.
                     "-Xklib-no-double-inlining=false",
-
-                    // Enable narrowing of visibility for synthetic accessors.
-                    "-Xsynthetic-accessors-with-narrowed-visibility".takeIf { nativeTestInstances.enclosingTestInstance.narrowedAccessorVisibility }
                 )
 
                 build()