Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1280,6 +1280,50 @@ class ComposeCrossModuleTests(useFir: Boolean) : AbstractCodegenTest(useFir) {
)
}

// regression test for https://issuetracker.google.com/issues/461766771
@Test
fun testLegacyOpenFunctionWithDefaultFalsePositives() {
assumeTrue(useFir)
compile(
mapOf(
"Base" to mapOf(
"base/Base.kt" to """
package base

import androidx.compose.runtime.Composable

interface Modifier {
companion object : Modifier
}

interface I {
@Composable fun Content(modifier: Modifier = Modifier)
}

class C1() : I {
@Composable
override fun Content(modifier: Modifier) {}
}
"""
),
"Main" to mapOf(
"Main.kt" to """
package main

import androidx.compose.runtime.Composable
import base.C1
import base.Modifier

class C2() : C1() {
@Composable
override fun Content(modifier: Modifier) {}
}
"""
)
)
)
}

// regression test for https://issuetracker.google.com/issues/345261077
@Test
fun composableInferredReturnType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -579,11 +579,13 @@ class ComposerParamTransformer(
}

private fun IrSimpleFunction.isLegacyOpenFunctionWithDefault(): Boolean =
modality == Modality.OPEN && (
overriddenSymbols.isEmpty() &&
modality == Modality.OPEN && (
origin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB &&
parameters.any { it.hasDefaultValue() } &&
composeMetadata?.supportsOpenFunctionsWithDefaultParams() != true
) || overriddenSymbols.any { it.owner.isLegacyOpenFunctionWithDefault() }
)
|| overriddenSymbols.any { it.owner.isLegacyOpenFunctionWithDefault() }


private fun IrSimpleFunction.hasDefaultForParam(index: Int): Boolean {
Expand Down