Make parameter types for inline classes nullable when underlying type…

… is not primitive Updates default parameter conversion to ensure that Kotlin doesn't generate a non-null check when underlying type is not primitive. Test: added compiler tests Fixes: 330655412 ( https://issuetracker.google.com/issues/330655412 ) Change-Id: Ie6bb527824c8542a0f922984f73f4af367ff21ac ( https://android-review.googlesource.com/q/Ie6bb527824c8542a0f922984f73f4af367ff21ac ) Moved from: androidx/androidx@13c32b7
JetBrains · Apr 19, 2024 · 53f4f37 · 53f4f37
1 parent bac322c
commit 53f4f37
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 1 deletion.
diff --git a/...oidUnitTest/kotlin/androidx/compose/compiler/plugins/kotlin/ComposeBytecodeCodegenTest.kt b/...oidUnitTest/kotlin/androidx/compose/compiler/plugins/kotlin/ComposeBytecodeCodegenTest.kt
@@ -780,4 +780,27 @@ class ComposeBytecodeCodegenTest(useFir: Boolean) : AbstractCodegenTest(useFir)
  }
  """
  )
+
+ @Test
+ fun composeValueClassDefaultParameter() =
+ validateBytecode(
+ """
+ import androidx.compose.runtime.*
+
+ @JvmInline
+ value class Data(val string: String)
+ @JvmInline
+ value class IntData(val value: Int)
+
+ @Composable fun Example(data: Data = Data(""), intData: IntData = IntData(0)) {}
+ """,
+ validate = {
+ // select Example function body
+ val match = Regex("public final static Example[\\s\\S]*?LOCALVARIABLE").find(it)!!
+ assertFalse(message = "Function body should not contain a not-null check.") {
+ match.value.contains("Intrinsics.checkNotNullParameter")
+ }
+ },
+ dumpClasses = true
+ )
 }
diff --git a/...rc/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/ComposerParamTransformTests.kt b/...rc/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/ComposerParamTransformTests.kt
@@ -575,4 +575,20 @@ class ComposerParamTransformTests(useFir: Boolean) : AbstractIrTransformTest(use
  }
  """
  )
+
+ @Test
+ fun composeValueClassDefaultParameter() =
+ verifyGoldenComposeIrTransform(
+ extra = """
+ @JvmInline
+ value class Data(val string: String)
+ @JvmInline
+ value class IntData(val value: Int)
+ """,
+ source = """
+ import androidx.compose.runtime.*
+
+ @Composable fun Example(data: Data = Data(""), intData: IntData = IntData(0)) {}
+ """
+ )
 }
diff --git a/....kotlin.ComposerParamTransformTests/composeValueClassDefaultParameter[useFir = false].txt b/....kotlin.ComposerParamTransformTests/composeValueClassDefaultParameter[useFir = false].txt
@@ -0,0 +1,36 @@
+//
+// Source
+// ------------------------------------------
+
+import androidx.compose.runtime.*
+
+@Composable fun Example(data: Data = Data(""), intData: IntData = IntData(0)) {}
+
+//
+// Transformed IR
+// ------------------------------------------
+
+@Composable
+fun Example(data: Data?, intData: IntData, %composer: Composer?, %changed: Int, %default: Int) {
+ %composer = %composer.startRestartGroup(<>)
+ sourceInformation(%composer, "C(Example)P(0:Data,1:IntData):Test.kt")
+ if (%changed and 0b0001 != 0 || !%composer.skipping) {
+ if (%default and 0b0001 != 0) {
+ data = Data("")
+ }
+ if (%default and 0b0010 != 0) {
+ intData = IntData(0)
+ }
+ if (isTraceInProgress()) {
+ traceEventStart(<>, %changed, -1, <>)
+ }
+ if (isTraceInProgress()) {
+ traceEventEnd()
+ }
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+ Example(data, intData, %composer, updateChangedFlags(%changed or 0b0001), %default)
+ }
+}
diff --git a/...s.kotlin.ComposerParamTransformTests/composeValueClassDefaultParameter[useFir = true].txt b/...s.kotlin.ComposerParamTransformTests/composeValueClassDefaultParameter[useFir = true].txt
@@ -0,0 +1,36 @@
+//
+// Source
+// ------------------------------------------
+
+import androidx.compose.runtime.*
+
+@Composable fun Example(data: Data = Data(""), intData: IntData = IntData(0)) {}
+
+//
+// Transformed IR
+// ------------------------------------------
+
+@Composable
+fun Example(data: Data?, intData: IntData, %composer: Composer?, %changed: Int, %default: Int) {
+ %composer = %composer.startRestartGroup(<>)
+ sourceInformation(%composer, "C(Example)P(0:Data,1:IntData):Test.kt")
+ if (%changed and 0b0001 != 0 || !%composer.skipping) {
+ if (%default and 0b0001 != 0) {
+ data = Data("")
+ }
+ if (%default and 0b0010 != 0) {
+ intData = IntData(0)
+ }
+ if (isTraceInProgress()) {
+ traceEventStart(<>, %changed, -1, <>)
+ }
+ if (isTraceInProgress()) {
+ traceEventEnd()
+ }
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+ Example(data, intData, %composer, updateChangedFlags(%changed or 0b0001), %default)
+ }
+}
diff --git a/...ed/runtime-tests/src/commonTest/kotlin/androidx/compose/compiler/test/CompositionTests.kt b/...ed/runtime-tests/src/commonTest/kotlin/androidx/compose/compiler/test/CompositionTests.kt
@@ -73,6 +73,13 @@ class CompositionTests {
  Text("1")
  }
  }
+
+ @Test
+ fun composeValueClassDefaultParameter() = compositionTest {
+ compose {
+ DefaultValueClass()
+ }
+ }
 }
 
 class CrossInlineState(content: @Composable () -> Unit = { }) {
@@ -86,3 +93,13 @@ class CrossInlineState(content: @Composable () -> Unit = { }) {
  @Composable
  fun place() { content() }
 }
+
+@JvmInline
+value class Data(val string: String)
+
+@Composable
+fun DefaultValueClass(
+ data: Data = Data("Hello")
+) {
+ println(data)
+}
diff --git a/.../src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt b/.../src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt
@@ -626,7 +626,11 @@ class ComposerParamTransformer(
  return when {
  type.isPrimitiveType() -> type
  type.isInlineClassType() -> if (context.platform.isJvm() || constructorAccessible) {
- type
+ if (type.unboxInlineClass().isPrimitiveType()) {
+ type
+ } else {
+ type.makeNullable()
+ }
  } else {
  // k/js and k/native: private constructors of value classes can be not accessible.
  // Therefore it won't be possible to create a "fake" default argument for calls.