IR Inliner: Tests for backing fields leakage through private inline funs

^KT-71137
JetBrains · Sep 5, 2024 · fb4b1ad · fb4b1ad
1 parent 1507d26
commit fb4b1ad
Show file tree

Hide file tree

Showing 18 changed files with 258 additions and 60 deletions.
diff --git a/...rossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt b/...rossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt
@@ -17,13 +17,20 @@ public class OK
                 /* TARGET use-site */ <this>.#k
         public fun <set-k>(<set-?>: String)
             /* TARGET use-site */ <this>.#k = <set-?>
-    internal inline fun initializeAndReadLateinitProperties(): 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>)
-        /* 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>)
+    private inline fun doInitializeAndReadOK(): String
+        /* TARGET use-site */ <this>.#o
+        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
+        /* TARGET use-site */ <this>.#o
+        /* 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)
+        /* 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 */ internal /* static */ fun access$<get-o>($this: OK): String
         /* TARGET use-site */ $this.<get-o>()
     /* ACCESSOR declaration */ internal /* static */ fun access$<set-o>($this: OK, <set-?>: String)

diff --git a/...eMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/...eMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
@@ -17,13 +17,20 @@ public class OK
                 /* TARGET use-site */ <this>.#k
         public fun <set-k>(<set-?>: String)
             /* TARGET use-site */ <this>.#k = <set-?>
-    internal inline fun initializeAndReadLateinitProperties(): 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>)
-        /* 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>)
+    private inline fun doInitializeAndReadOK(): String
+        /* TARGET use-site */ <this>.#o
+        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
+        /* TARGET use-site */ <this>.#o
+        /* 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)
+        /* 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)

diff --git a/...sors/privateMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt b/...sors/privateMember/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt
@@ -1,9 +1,26 @@
 // FILE: OK.kt
 class OK {
+    private lateinit var x: String // never leaked
+    lateinit var y: String // never leaked
+
     private lateinit var o: String
     lateinit var k: String
 
-    internal inline fun initializeAndReadLateinitProperties(): String {
+    private inline fun doInitializeAndReadXY(): String {
+        if (::x.isInitialized) throw Error("Property 'x' already initialized")
+        x = "X"
+        if (!::x.isInitialized) throw Error("Property 'x' is not initialized")
+
+        if (::y.isInitialized) throw Error("Property 'y' already initialized")
+        y = "Y"
+        if (!::y.isInitialized) throw Error("Property 'y' is not initialized")
+
+        return x + y
+    }
+
+    internal fun initializeAndReadXY(): String = doInitializeAndReadXY()
+
+    private inline fun doInitializeAndReadOK(): String {
         if (::o.isInitialized) throw Error("Property 'o' already initialized")
         o = "O"
         if (!::o.isInitialized) throw Error("Property 'o' is not initialized")
@@ -14,7 +31,9 @@ class OK {
 
         return o + k
     }
+
+    internal inline fun initializeAndReadOK(): String = doInitializeAndReadOK()
 }
 
 // FILE: main.kt
-fun box(): String = OK().initializeAndReadLateinitProperties()
+fun box(): String = OK().initializeAndReadOK()
diff --git a/...ssModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt b/...ssModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt
@@ -17,13 +17,20 @@ public class OK
                 /* TARGET use-site */ <this>.#k
         public fun <set-k>(<set-?>: String)
             /* TARGET use-site */ <this>.#k = <set-?>
-    internal inline fun initializeAndReadLateinitProperties(): 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>)
-        /* 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>)
+    private inline fun doInitializeAndReadOK(): String
+        /* TARGET use-site */ <this>.#o
+        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
+        /* TARGET use-site */ <this>.#o
+        /* 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)
+        /* 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 */ internal /* static */ fun access$<get-o>($this: OK): String
         /* TARGET use-site */ $this.<get-o>()
     /* ACCESSOR declaration */ internal /* static */ fun access$<set-o>($this: OK, <set-?>: String)

diff --git a/...ember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/...ember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
@@ -17,13 +17,20 @@ public class OK
                 /* TARGET use-site */ <this>.#k
         public fun <set-k>(<set-?>: String)
             /* TARGET use-site */ <this>.#k = <set-?>
-    internal inline fun initializeAndReadLateinitProperties(): 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>)
-        /* 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>)
+    private inline fun doInitializeAndReadOK(): String
+        /* TARGET use-site */ <this>.#o
+        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
+        /* TARGET use-site */ <this>.#o
+        /* 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)
+        /* 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)

diff --git a/...rs/privateMember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt b/...rs/privateMember/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt
@@ -1,10 +1,27 @@
 // MODULE: lib
 // FILE: OK.kt
 class OK {
+    private lateinit var x: String // never leaked
+    lateinit var y: String // never leaked
+
     private lateinit var o: String
     lateinit var k: String
 
-    internal inline fun initializeAndReadLateinitProperties(): String {
+    private inline fun doInitializeAndReadXY(): String {
+        if (::x.isInitialized) throw Error("Property 'x' already initialized")
+        x = "X"
+        if (!::x.isInitialized) throw Error("Property 'x' is not initialized")
+
+        if (::y.isInitialized) throw Error("Property 'y' already initialized")
+        y = "Y"
+        if (!::y.isInitialized) throw Error("Property 'y' is not initialized")
+
+        return x + y
+    }
+
+    internal fun initializeAndReadXY(): String = doInitializeAndReadXY()
+
+    private inline fun doInitializeAndReadOK(): String {
         if (::o.isInitialized) throw Error("Property 'o' already initialized")
         o = "O"
         if (!::o.isInitialized) throw Error("Property 'o' is not initialized")
@@ -15,8 +32,10 @@ class OK {
 
         return o + k
     }
+
+    internal inline fun initializeAndReadOK(): String = doInitializeAndReadOK()
 }
 
 // MODULE: main()(lib)
 // FILE: main.kt
-fun box(): String = OK().initializeAndReadLateinitProperties()
+fun box(): String = OK().initializeAndReadOK()
diff --git a/...rivateMember/singleFile/useLateinitIsInitializedFromInternalInline.accessors-narrowed.txt b/...rivateMember/singleFile/useLateinitIsInitializedFromInternalInline.accessors-narrowed.txt
@@ -17,13 +17,20 @@ public class OK
                 /* TARGET use-site */ <this>.#k
         public fun <set-k>(<set-?>: String)
             /* TARGET use-site */ <this>.#k = <set-?>
-    internal inline fun initializeAndReadLateinitProperties(): 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>)
-        /* 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>)
+    private inline fun doInitializeAndReadOK(): String
+        /* TARGET use-site */ <this>.#o
+        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
+        /* TARGET use-site */ <this>.#o
+        /* 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)
+        /* 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 */ internal /* static */ fun access$<get-o>($this: OK): String
         /* TARGET use-site */ $this.<get-o>()
     /* ACCESSOR declaration */ internal /* static */ fun access$<set-o>($this: OK, <set-?>: String)

diff --git a/...cessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt b/...cessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.accessors.txt
@@ -17,13 +17,20 @@ public class OK
                 /* TARGET use-site */ <this>.#k
         public fun <set-k>(<set-?>: String)
             /* TARGET use-site */ <this>.#k = <set-?>
-    internal inline fun initializeAndReadLateinitProperties(): 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>)
-        /* 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>)
+    private inline fun doInitializeAndReadOK(): String
+        /* TARGET use-site */ <this>.#o
+        /* TARGET use-site */ <this>.<set-o>(<set-?> = "O")
+        /* TARGET use-site */ <this>.#o
+        /* 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)
+        /* 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)

diff --git a/...syntheticAccessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.kt b/...syntheticAccessors/privateMember/singleFile/useLateinitIsInitializedFromInternalInline.kt
@@ -1,8 +1,25 @@
 class OK {
+    private lateinit var x: String // never leaked
+    lateinit var y: String // never leaked
+
     private lateinit var o: String
     lateinit var k: String
 
-    internal inline fun initializeAndReadLateinitProperties(): String {
+    private inline fun doInitializeAndReadXY(): String {
+        if (::x.isInitialized) throw Error("Property 'x' already initialized")
+        x = "X"
+        if (!::x.isInitialized) throw Error("Property 'x' is not initialized")
+
+        if (::y.isInitialized) throw Error("Property 'y' already initialized")
+        y = "Y"
+        if (!::y.isInitialized) throw Error("Property 'y' is not initialized")
+
+        return x + y
+    }
+
+    internal fun initializeAndReadXY(): String = doInitializeAndReadXY()
+
+    private inline fun doInitializeAndReadOK(): String {
         if (::o.isInitialized) throw Error("Property 'o' already initialized")
         o = "O"
         if (!::o.isInitialized) throw Error("Property 'o' is not initialized")
@@ -13,6 +30,8 @@ class OK {
 
         return o + k
     }
+
+    internal inline fun initializeAndReadOK(): String = doInitializeAndReadOK()
 }
 
-fun box(): String = OK().initializeAndReadLateinitProperties()
+fun box(): String = OK().initializeAndReadOK()
diff --git a/...rossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt b/...rossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt
@@ -16,7 +16,14 @@ public lateinit var k: String?
             /* TARGET use-site */ #k
     public fun <set-k>(<set-?>: String)
         /* TARGET use-site */ #k = <set-?>
-internal inline fun initializeAndReadLateinitProperties(): String
+private inline fun doInitializeAndReadOK(): String
+    /* TARGET use-site */ #o
+    /* TARGET use-site */ <set-o>(<set-?> = "O")
+    /* TARGET use-site */ #o
+    /* 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()

diff --git a/...Private/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/...Private/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
@@ -16,7 +16,14 @@ public lateinit var k: String?
             /* TARGET use-site */ #k
     public fun <set-k>(<set-?>: String)
         /* TARGET use-site */ #k = <set-?>
-internal inline fun initializeAndReadLateinitProperties(): String
+private inline fun doInitializeAndReadOK(): String
+    /* TARGET use-site */ #o
+    /* TARGET use-site */ <set-o>(<set-?> = "O")
+    /* TARGET use-site */ #o
+    /* 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()

diff --git a/...rs/topLevelPrivate/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt b/...rs/topLevelPrivate/crossFilePrivateLeak/leakingLateinitIsInitializedFromInternalInline.kt
@@ -1,8 +1,25 @@
 // FILE: OK.kt
+private lateinit var x: String // never leaked
+lateinit var y: String // never leaked
+
 private lateinit var o: String
 lateinit var k: String
 
-internal inline fun initializeAndReadLateinitProperties(): String {
+private inline fun doInitializeAndReadXY(): String {
+    if (::x.isInitialized) throw Error("Property 'x' already initialized")
+    x = "X"
+    if (!::x.isInitialized) throw Error("Property 'x' is not initialized")
+
+    if (::y.isInitialized) throw Error("Property 'y' already initialized")
+    y = "Y"
+    if (!::y.isInitialized) throw Error("Property 'y' is not initialized")
+
+    return x + y
+}
+
+internal fun initializeAndReadXY(): String = doInitializeAndReadXY()
+
+private inline fun doInitializeAndReadOK(): String {
     if (::o.isInitialized) throw Error("Property 'o' already initialized")
     o = "O"
     if (!::o.isInitialized) throw Error("Property 'o' is not initialized")
@@ -14,5 +31,7 @@ internal inline fun initializeAndReadLateinitProperties(): String {
     return o + k
 }
 
+internal inline fun initializeAndReadOK(): String = doInitializeAndReadOK()
+
 // FILE: main.kt
-fun box(): String = initializeAndReadLateinitProperties()
+fun box(): String = initializeAndReadOK()
diff --git a/...ssModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt b/...ssModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors-narrowed.txt
@@ -2,13 +2,20 @@
 
 /* FILE package=<root> fileName=OK.kt */
 
-internal inline fun initializeAndReadLateinitProperties(): String
+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()
     /* 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
+    /* 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

diff --git a/...ivate/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt b/...ivate/crossModulePrivateLeak/leakingLateinitIsInitializedFromInternalInline.accessors.txt
@@ -2,13 +2,20 @@
 
 /* FILE package=<root> fileName=OK.kt */
 
-internal inline fun initializeAndReadLateinitProperties(): String
+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()
     /* 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
+    /* 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