[Tests] Add captured type parameters in synthetic accessors tests

francescoo22 · Space Team · commit 6cb7cd13110e · 2025-10-06T17:20:16.000Z
^79739
diff --git a/compiler/testData/codegen/box/typeErasure/outerClassWithTypeParameterAndChainOfInnerClassesWithTypeParameters.preprocessed.ir.txt b/compiler/testData/codegen/box/typeErasure/outerClassWithTypeParameterAndChainOfInnerClassesWithTypeParameters.preprocessed.ir.txt
@@ -17,15 +17,24 @@ FUN name:foo visibility:public modality:FINAL returnType:kotlin.Int [inline]
                     ARG <this>: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
                       ARG <this>: CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY
                         ARG <this>: CALL 'public final fun <get-a> (): T of <root>.A declared in <root>.A' type=kotlin.CharSequence origin=GET_PROPERTY
-                          ARG <this>: CALL 'public final fun access$<outer-this-1> ($this: <root>.A.Inner1.Inner2<I2 of <root>.A.Inner1.Inner2, I1 of <root>.A.Inner1, T of <root>.A>): <root>.A<T of <root>.A> declared in <root>.A.Inner1.Inner2' type=<root>.A<kotlin.CharSequence> origin=null
+                          ARG <this>: CALL 'public final fun access$<outer-this-1> <I2, I1, T> ($this: <root>.A.Inner1.Inner2<I2 of <root>.A.Inner1.Inner2.access$<outer-this-1>, I1 of <root>.A.Inner1.Inner2.access$<outer-this-1>, T of <root>.A.Inner1.Inner2.access$<outer-this-1>>): <root>.A<T of <root>.A.Inner1.Inner2.access$<outer-this-1>> declared in <root>.A.Inner1.Inner2' type=<root>.A<kotlin.CharSequence> origin=null
+                            TYPE_ARG I2: kotlin.CharSequence
+                            TYPE_ARG I1: kotlin.CharSequence
+                            TYPE_ARG T: kotlin.CharSequence
                             ARG $this: GET_VAR '<this>: <root>.A.Inner1.Inner2<kotlin.CharSequence, kotlin.CharSequence, kotlin.CharSequence> declared in <root>.foo' type=<root>.A.Inner1.Inner2<kotlin.CharSequence, kotlin.CharSequence, kotlin.CharSequence> origin=null
                       ARG other: CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY
                         ARG <this>: CALL 'public final fun <get-b> (): T of <root>.A declared in <root>.A.Inner1' type=kotlin.CharSequence origin=GET_PROPERTY
-                          ARG <this>: CALL 'public final fun access$<outer-this-0> ($this: <root>.A.Inner1.Inner2<I2 of <root>.A.Inner1.Inner2, I1 of <root>.A.Inner1, T of <root>.A>): <root>.A.Inner1<I1 of <root>.A.Inner1, T of <root>.A> declared in <root>.A.Inner1.Inner2' type=<root>.A.Inner1<kotlin.CharSequence, kotlin.CharSequence> origin=null
+                          ARG <this>: CALL 'public final fun access$<outer-this-0> <I2, I1, T> ($this: <root>.A.Inner1.Inner2<I2 of <root>.A.Inner1.Inner2.access$<outer-this-0>, I1 of <root>.A.Inner1.Inner2.access$<outer-this-0>, T of <root>.A.Inner1.Inner2.access$<outer-this-0>>): <root>.A.Inner1<I1 of <root>.A.Inner1.Inner2.access$<outer-this-0>, T of <root>.A.Inner1.Inner2.access$<outer-this-0>> declared in <root>.A.Inner1.Inner2' type=<root>.A.Inner1<kotlin.CharSequence, kotlin.CharSequence> origin=null
+                            TYPE_ARG I2: kotlin.CharSequence
+                            TYPE_ARG I1: kotlin.CharSequence
+                            TYPE_ARG T: kotlin.CharSequence
                             ARG $this: GET_VAR '<this>: <root>.A.Inner1.Inner2<kotlin.CharSequence, kotlin.CharSequence, kotlin.CharSequence> declared in <root>.foo' type=<root>.A.Inner1.Inner2<kotlin.CharSequence, kotlin.CharSequence, kotlin.CharSequence> origin=null
                     ARG other: CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY
                       ARG <this>: CALL 'public final fun <get-c> (): I1 of <root>.A.Inner1 declared in <root>.A.Inner1' type=kotlin.CharSequence origin=GET_PROPERTY
-                        ARG <this>: CALL 'public final fun access$<outer-this-0> ($this: <root>.A.Inner1.Inner2<I2 of <root>.A.Inner1.Inner2, I1 of <root>.A.Inner1, T of <root>.A>): <root>.A.Inner1<I1 of <root>.A.Inner1, T of <root>.A> declared in <root>.A.Inner1.Inner2' type=<root>.A.Inner1<kotlin.CharSequence, kotlin.CharSequence> origin=null
+                        ARG <this>: CALL 'public final fun access$<outer-this-0> <I2, I1, T> ($this: <root>.A.Inner1.Inner2<I2 of <root>.A.Inner1.Inner2.access$<outer-this-0>, I1 of <root>.A.Inner1.Inner2.access$<outer-this-0>, T of <root>.A.Inner1.Inner2.access$<outer-this-0>>): <root>.A.Inner1<I1 of <root>.A.Inner1.Inner2.access$<outer-this-0>, T of <root>.A.Inner1.Inner2.access$<outer-this-0>> declared in <root>.A.Inner1.Inner2' type=<root>.A.Inner1<kotlin.CharSequence, kotlin.CharSequence> origin=null
+                          TYPE_ARG I2: kotlin.CharSequence
+                          TYPE_ARG I1: kotlin.CharSequence
+                          TYPE_ARG T: kotlin.CharSequence
                           ARG $this: GET_VAR '<this>: <root>.A.Inner1.Inner2<kotlin.CharSequence, kotlin.CharSequence, kotlin.CharSequence> declared in <root>.foo' type=<root>.A.Inner1.Inner2<kotlin.CharSequence, kotlin.CharSequence, kotlin.CharSequence> origin=null
                   ARG other: CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY
                     ARG <this>: CALL 'public final fun <get-d> (): T of <root>.A declared in <root>.A.Inner1.Inner2' type=kotlin.CharSequence origin=GET_PROPERTY
diff --git a/compiler/testData/codegen/box/typeErasure/outerClassWithTypeParameterAndInnerClassWithTypeParameter.preprocessed.ir.txt b/compiler/testData/codegen/box/typeErasure/outerClassWithTypeParameterAndInnerClassWithTypeParameter.preprocessed.ir.txt
@@ -12,7 +12,9 @@ FUN name:foo visibility:public modality:FINAL returnType:kotlin.Int [inline]
             ARG <this>: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
               ARG <this>: CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY
                 ARG <this>: CALL 'public final fun <get-a> (): T of <root>.A declared in <root>.A' type=kotlin.CharSequence origin=GET_PROPERTY
-                  ARG <this>: CALL 'public final fun access$<outer-this-0> ($this: <root>.A.Inner<I of <root>.A.Inner, T of <root>.A>): <root>.A<T of <root>.A> declared in <root>.A.Inner' type=<root>.A<kotlin.CharSequence> origin=null
+                  ARG <this>: CALL 'public final fun access$<outer-this-0> <I, T> ($this: <root>.A.Inner<I of <root>.A.Inner.access$<outer-this-0>, T of <root>.A.Inner.access$<outer-this-0>>): <root>.A<T of <root>.A.Inner.access$<outer-this-0>> declared in <root>.A.Inner' type=<root>.A<kotlin.CharSequence> origin=null
+                    TYPE_ARG I: kotlin.CharSequence
+                    TYPE_ARG T: kotlin.CharSequence
                     ARG $this: GET_VAR '<this>: <root>.A.Inner<kotlin.CharSequence, kotlin.CharSequence> declared in <root>.foo' type=<root>.A.Inner<kotlin.CharSequence, kotlin.CharSequence> origin=null
               ARG other: CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY
                 ARG <this>: CALL 'public final fun <get-b> (): T of <root>.A declared in <root>.A.Inner' type=kotlin.CharSequence origin=GET_PROPERTY
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossFileLeak/leakingOuterThisWithTypeParameters.accessors.txt
@@ -6,15 +6,15 @@ public class Outer<O : Any?>
     public inner class InnerL1<I1 : Any?>
         public inner class InnerL2<I2 : Any?>
             public inline fun getAll(): Triple<O, I1, I2>
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
+                /* ACCESSOR use-site */ access$<outer-this-1><I2, I1, O>($this = <this>)
+                /* ACCESSOR use-site */ access$<outer-this-0><I2, I1, O>($this = <this>)
             /* ACCESSOR declaration */ private fun <outer-this-0>(): InnerL1<I1, O>
                 /* TARGET use-site */ <this>
             /* ACCESSOR declaration */ private fun <outer-this-1>(): Outer<O>
                 /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL2<I2, I1, O>): InnerL1<I1, O>
+            /* ACCESSOR declaration */ public /* static */ fun <I2 : Any?, I1 : Any?, O : Any?> access$<outer-this-0>($this: InnerL2<I2, I1, O>): InnerL1<I1, O>
                 /* ACCESSOR use-site */ $this.<outer-this-0>()
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-1>($this: InnerL2<I2, I1, O>): Outer<O>
+            /* ACCESSOR declaration */ public /* static */ fun <I2 : Any?, I1 : Any?, O : Any?> access$<outer-this-1>($this: InnerL2<I2, I1, O>): Outer<O>
                 /* ACCESSOR use-site */ $this.<outer-this-1>()
         /* TARGET declaration */ <this>: InnerL1<I1, O>
     /* TARGET declaration */ <this>: Outer<O>
@@ -24,5 +24,5 @@ public class Outer<O : Any?>
 
 public fun box(): String
     val result: String
-        /* ACCESSOR use-site */ access$<outer-this-1>($this = this)
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
+        /* ACCESSOR use-site */ access$<outer-this-1><Any?, Any?, Any?>($this = this)
+        /* ACCESSOR use-site */ access$<outer-this-0><Any?, Any?, Any?>($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/crossModuleLeak/leakingOuterThisWithTypeParameters.accessors.txt
@@ -6,15 +6,15 @@ public class Outer<O : Any?>
     public inner class InnerL1<I1 : Any?>
         public inner class InnerL2<I2 : Any?>
             public inline fun getAll(): Triple<O, I1, I2>
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
+                /* ACCESSOR use-site */ access$<outer-this-1><I2, I1, O>($this = <this>)
+                /* ACCESSOR use-site */ access$<outer-this-0><I2, I1, O>($this = <this>)
             /* ACCESSOR declaration */ private fun <outer-this-0>(): InnerL1<I1, O>
                 /* TARGET use-site */ <this>
             /* ACCESSOR declaration */ private fun <outer-this-1>(): Outer<O>
                 /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL2<I2, I1, O>): InnerL1<I1, O>
+            /* ACCESSOR declaration */ public /* static */ fun <I2 : Any?, I1 : Any?, O : Any?> access$<outer-this-0>($this: InnerL2<I2, I1, O>): InnerL1<I1, O>
                 /* ACCESSOR use-site */ $this.<outer-this-0>()
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-1>($this: InnerL2<I2, I1, O>): Outer<O>
+            /* ACCESSOR declaration */ public /* static */ fun <I2 : Any?, I1 : Any?, O : Any?> access$<outer-this-1>($this: InnerL2<I2, I1, O>): Outer<O>
                 /* ACCESSOR use-site */ $this.<outer-this-1>()
         /* TARGET declaration */ <this>: InnerL1<I1, O>
     /* TARGET declaration */ <this>: Outer<O>
@@ -26,5 +26,5 @@ public class Outer<O : Any?>
 
 public fun box(): String
     val result: String
-        /* ACCESSOR use-site */ access$<outer-this-1>($this = this)
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
+        /* ACCESSOR use-site */ access$<outer-this-1><Any?, Any?, Any?>($this = this)
+        /* ACCESSOR use-site */ access$<outer-this-0><Any?, Any?, Any?>($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.accessors.txt b/compiler/testData/klib/syntheticAccessors/outerThis/singleFile/leakingOuterThisWithTypeParameters.accessors.txt
@@ -6,19 +6,19 @@ public class Outer<O : Any?>
     public inner class InnerL1<I1 : Any?>
         public inner class InnerL2<I2 : Any?>
             public inline fun getAll(): Triple<O, I1, I2>
-                /* ACCESSOR use-site */ access$<outer-this-1>($this = <this>)
-                /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
+                /* ACCESSOR use-site */ access$<outer-this-1><I2, I1, O>($this = <this>)
+                /* ACCESSOR use-site */ access$<outer-this-0><I2, I1, O>($this = <this>)
             /* ACCESSOR declaration */ private fun <outer-this-0>(): InnerL1<I1, O>
                 /* TARGET use-site */ <this>
             /* ACCESSOR declaration */ private fun <outer-this-1>(): Outer<O>
                 /* TARGET use-site */ <this>
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-0>($this: InnerL2<I2, I1, O>): InnerL1<I1, O>
+            /* ACCESSOR declaration */ public /* static */ fun <I2 : Any?, I1 : Any?, O : Any?> access$<outer-this-0>($this: InnerL2<I2, I1, O>): InnerL1<I1, O>
                 /* ACCESSOR use-site */ $this.<outer-this-0>()
-            /* ACCESSOR declaration */ public /* static */ fun access$<outer-this-1>($this: InnerL2<I2, I1, O>): Outer<O>
+            /* ACCESSOR declaration */ public /* static */ fun <I2 : Any?, I1 : Any?, O : Any?> access$<outer-this-1>($this: InnerL2<I2, I1, O>): Outer<O>
                 /* ACCESSOR use-site */ $this.<outer-this-1>()
         /* TARGET declaration */ <this>: InnerL1<I1, O>
     /* TARGET declaration */ <this>: Outer<O>
 public fun box(): String
     val result: String
-        /* ACCESSOR use-site */ access$<outer-this-1>($this = this)
-        /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
+        /* ACCESSOR use-site */ access$<outer-this-1><Any?, Any?, Any?>($this = this)
+        /* ACCESSOR use-site */ access$<outer-this-0><Any?, Any?, Any?>($this = this)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorInInnerClassWithTypeParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/leakingPrivateConstructorInInnerClassWithTypeParameter.accessors.txt
@@ -9,19 +9,19 @@ public class A
             /* TARGET use-site */ <this>
             /* TARGET use-site */ <this>.Inner<T>(s = "" as T)
         internal inline fun internalInlineMethod(s: T): Inner<T>
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>).Inner<T>(s = s, $constructor_marker = null)
+            /* ACCESSOR use-site */ access$<outer-this-0><T>($this = <this>)
+            /* ACCESSOR use-site */ access$<outer-this-0><T>($this = <this>).Inner<T>(s = s, $constructor_marker = null)
         /* ACCESSOR declaration */ private fun <outer-this-0>(): A
             /* TARGET use-site */ <this>
         /* ACCESSOR declaration */ internal constructor(s: T, $constructor_marker: SyntheticConstructorMarker?)
             /* TARGET use-site */ <this>.Inner<T>(s = s)
-        /* ACCESSOR declaration */ internal /* static */ fun access$<outer-this-0>($this: Inner<T>): A
+        /* ACCESSOR declaration */ internal /* static */ fun <T : Any?> access$<outer-this-0>($this: Inner<T>): A
             /* ACCESSOR use-site */ $this.<outer-this-0>()
     /* TARGET declaration */ <this>: A
 
 
 /* FILE package=<root> fileName=main.kt */
 
 public fun box(): String
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this).Inner<Any?>(s = s, $constructor_marker = null)
+    /* ACCESSOR use-site */ access$<outer-this-0><Any?>($this = this)
+    /* ACCESSOR use-site */ access$<outer-this-0><Any?>($this = this).Inner<Any?>(s = s, $constructor_marker = null)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateMethodFromInternalInlineGenericFakeOverride.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossFilePrivateLeak/usePrivateMethodFromInternalInlineGenericFakeOverride.accessors.txt
@@ -5,12 +5,12 @@
 public open class A<T : Any?>
     /* TARGET declaration */ private fun <U : Any?> privateMethod(o: T, k: U): String
     internal inline fun <U : Any?> internalInlineMethod(o: T, k: U): String
-        /* ACCESSOR use-site */ access$privateMethod<U>($this = <this>, o = o, k = k)
-    /* ACCESSOR declaration */ internal /* static */ fun <U : Any?> access$privateMethod($this: A<T>, o: T, k: U): String
+        /* ACCESSOR use-site */ access$privateMethod<T, U>($this = <this>, o = o, k = k)
+    /* ACCESSOR declaration */ internal /* static */ fun <T : Any?, U : Any?> access$privateMethod($this: A<T>, o: T, k: U): String
         /* TARGET use-site */ $this.privateMethod<U>(o = o, k = k)
 
 
 /* FILE package=<root> fileName=B.kt */
 
 public fun box(): String
-    /* ACCESSOR use-site */ access$privateMethod<Any?>($this = this, o = o, k = k)
+    /* ACCESSOR use-site */ access$privateMethod<Any?, Any?>($this = this, o = o, k = k)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorInInnerClassWithTypeParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/leakingPrivateConstructorInInnerClassWithTypeParameter.accessors.txt
@@ -9,13 +9,13 @@ public class A
             /* TARGET use-site */ <this>
             /* TARGET use-site */ <this>.Inner<T>(s = "" as T)
         internal inline fun internalInlineMethod(s: T): Inner<T>
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>).Inner<T>(s = s, $constructor_marker = null)
+            /* ACCESSOR use-site */ access$<outer-this-0><T>($this = <this>)
+            /* ACCESSOR use-site */ access$<outer-this-0><T>($this = <this>).Inner<T>(s = s, $constructor_marker = null)
         /* ACCESSOR declaration */ private fun <outer-this-0>(): A
             /* TARGET use-site */ <this>
         /* ACCESSOR declaration */ internal constructor(s: T, $constructor_marker: SyntheticConstructorMarker?)
             /* TARGET use-site */ <this>.Inner<T>(s = s)
-        /* ACCESSOR declaration */ internal /* static */ fun access$<outer-this-0>($this: Inner<T>): A
+        /* ACCESSOR declaration */ internal /* static */ fun <T : Any?> access$<outer-this-0>($this: Inner<T>): A
             /* ACCESSOR use-site */ $this.<outer-this-0>()
     /* TARGET declaration */ <this>: A
 
@@ -25,5 +25,5 @@ public class A
 /* FILE package=<root> fileName=B.kt */
 
 public fun box(): String
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this).Inner<Any?>(s = s, $constructor_marker = null)
+    /* ACCESSOR use-site */ access$<outer-this-0><Any?>($this = this)
+    /* ACCESSOR use-site */ access$<outer-this-0><Any?>($this = this).Inner<Any?>(s = s, $constructor_marker = null)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateMethodFromInternalInlineGenericFakeOverride.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/crossModulePrivateLeak/usePrivateMethodFromInternalInlineGenericFakeOverride.accessors.txt
@@ -5,8 +5,8 @@
 public open class A<T : Any?>
     /* TARGET declaration */ private fun <U : Any?> privateMethod(o: T, k: U): String
     internal inline fun <U : Any?> internalInlineMethod(o: T, k: U): String
-        /* ACCESSOR use-site */ access$privateMethod<U>($this = <this>, o = o, k = k)
-    /* ACCESSOR declaration */ internal /* static */ fun <U : Any?> access$privateMethod($this: A<T>, o: T, k: U): String
+        /* ACCESSOR use-site */ access$privateMethod<T, U>($this = <this>, o = o, k = k)
+    /* ACCESSOR declaration */ internal /* static */ fun <T : Any?, U : Any?> access$privateMethod($this: A<T>, o: T, k: U): String
         /* TARGET use-site */ $this.privateMethod<U>(o = o, k = k)
 
 
@@ -15,4 +15,4 @@ public open class A<T : Any?>
 /* FILE package=<root> fileName=B.kt */
 
 public fun box(): String
-    /* ACCESSOR use-site */ access$privateMethod<Any?>($this = this, o = o, k = k)
+    /* ACCESSOR use-site */ access$privateMethod<Any?, Any?>($this = this, o = o, k = k)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateConstructorInInnerClassWithTypeParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/leakingPrivateConstructorInInnerClassWithTypeParameter.accessors.txt
@@ -9,15 +9,15 @@ public class A
             /* TARGET use-site */ <this>
             /* TARGET use-site */ <this>.Inner<T>(s = "" as T)
         internal inline fun internalInlineMethod(s: T): Inner<T>
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>)
-            /* ACCESSOR use-site */ access$<outer-this-0>($this = <this>).Inner<T>(s = s, $constructor_marker = null)
+            /* ACCESSOR use-site */ access$<outer-this-0><T>($this = <this>)
+            /* ACCESSOR use-site */ access$<outer-this-0><T>($this = <this>).Inner<T>(s = s, $constructor_marker = null)
         /* ACCESSOR declaration */ private fun <outer-this-0>(): A
             /* TARGET use-site */ <this>
         /* ACCESSOR declaration */ internal constructor(s: T, $constructor_marker: SyntheticConstructorMarker?)
             /* TARGET use-site */ <this>.Inner<T>(s = s)
-        /* ACCESSOR declaration */ internal /* static */ fun access$<outer-this-0>($this: Inner<T>): A
+        /* ACCESSOR declaration */ internal /* static */ fun <T : Any?> access$<outer-this-0>($this: Inner<T>): A
             /* ACCESSOR use-site */ $this.<outer-this-0>()
     /* TARGET declaration */ <this>: A
 public fun box(): String
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this)
-    /* ACCESSOR use-site */ access$<outer-this-0>($this = this).Inner<Any?>(s = s, $constructor_marker = null)
+    /* ACCESSOR use-site */ access$<outer-this-0><Any?>($this = this)
+    /* ACCESSOR use-site */ access$<outer-this-0><Any?>($this = this).Inner<Any?>(s = s, $constructor_marker = null)
diff --git a/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromInternalInlineGenericFakeOverride.accessors.txt b/compiler/testData/klib/syntheticAccessors/privateMember/singleFile/usePrivateMethodFromInternalInlineGenericFakeOverride.accessors.txt
