Skip to content

Commit 83c48a0

Browse files
ShikaSDSpace Cloud
ShikaSD
authored and
Space Cloud
committed
Remove decoys from Compose compiler
Decoys are no longer supported / required for JS compilation. Relnote: Decoy support for JS target is removed from Compose compiler
1 parent 0fc622e commit 83c48a0

15 files changed

+68
-1206
lines changed

‎plugins/compose/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/facade/KotlinCompilerFacade.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ abstract class KotlinCompilerFacade(val environment: KotlinCoreEnvironment) {
118118
disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES
119119
)
120120

121-
ComposePluginRegistrar.checkCompilerVersion(configuration)
121+
ComposePluginRegistrar.checkCompilerConfiguration(configuration)
122122

123123
environment.project.registerExtensions(configuration)
124124

‎plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeIrGenerationExtension.kt

+1-68
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,25 @@ import androidx.compose.compiler.plugins.kotlin.analysis.FqNameMatcher
2020
import androidx.compose.compiler.plugins.kotlin.analysis.StabilityInferencer
2121
import androidx.compose.compiler.plugins.kotlin.k1.ComposeDescriptorSerializerContext
2222
import androidx.compose.compiler.plugins.kotlin.lower.*
23-
import androidx.compose.compiler.plugins.kotlin.lower.decoys.CreateDecoysTransformer
24-
import androidx.compose.compiler.plugins.kotlin.lower.decoys.RecordDecoySignaturesTransformer
25-
import androidx.compose.compiler.plugins.kotlin.lower.decoys.SubstituteDecoyCallsTransformer
2623
import androidx.compose.compiler.plugins.kotlin.lower.hiddenfromobjc.AddHiddenFromObjCLowering
2724
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
2825
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
29-
import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable
30-
import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureFactory
31-
import org.jetbrains.kotlin.backend.common.serialization.signature.PublicIdSignatureComputer
3226
import org.jetbrains.kotlin.backend.common.validateIr
33-
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
3427
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
3528
import org.jetbrains.kotlin.config.IrVerificationMode
36-
import org.jetbrains.kotlin.descriptors.ClassDescriptor
37-
import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsGlobalDeclarationTable
38-
import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerIr
3929
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
4030
import org.jetbrains.kotlin.ir.visitors.acceptVoid
4131
import org.jetbrains.kotlin.platform.isJs
4232
import org.jetbrains.kotlin.platform.isWasm
4333
import org.jetbrains.kotlin.platform.jvm.isJvm
4434
import org.jetbrains.kotlin.platform.konan.isNative
45-
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
4635

4736
class ComposeIrGenerationExtension(
4837
@Suppress("unused") private val liveLiteralsEnabled: Boolean = false,
4938
@Suppress("unused") private val liveLiteralsV2Enabled: Boolean = false,
5039
private val generateFunctionKeyMetaClasses: Boolean = false,
5140
private val sourceInformationEnabled: Boolean = true,
5241
private val traceMarkersEnabled: Boolean = true,
53-
private val decoysEnabled: Boolean = false,
5442
private val metricsDestination: String? = null,
5543
private val reportsDestination: String? = null,
5644
private val irVerificationMode: IrVerificationMode = IrVerificationMode.NONE,
@@ -176,50 +164,13 @@ class ComposeIrGenerationExtension(
176164
featureFlags,
177165
).lower(moduleFragment)
178166

179-
val mangler = when {
180-
pluginContext.platform.isJs() -> JsManglerIr
181-
else -> null
182-
}
183-
184-
val idSignatureBuilder = when {
185-
pluginContext.platform.isJs() -> IdSignatureFactory(
186-
PublicIdSignatureComputer(mangler!!),
187-
DeclarationTable(JsGlobalDeclarationTable(pluginContext.irBuiltIns))
188-
)
189-
else -> null
190-
}
191-
if (decoysEnabled) {
192-
require(idSignatureBuilder != null) {
193-
"decoys are not supported for ${pluginContext.platform}"
194-
}
195-
196-
CreateDecoysTransformer(
197-
pluginContext,
198-
symbolRemapper,
199-
idSignatureBuilder,
200-
stabilityInferencer,
201-
metrics,
202-
featureFlags,
203-
).lower(moduleFragment)
204-
205-
SubstituteDecoyCallsTransformer(
206-
pluginContext,
207-
symbolRemapper,
208-
idSignatureBuilder,
209-
stabilityInferencer,
210-
metrics,
211-
featureFlags,
212-
).lower(moduleFragment)
213-
}
214-
215167
// transform all composable functions to have an extra synthetic composer
216168
// parameter. this will also transform all types and calls to include the extra
217169
// parameter.
218170
ComposerParamTransformer(
219171
pluginContext,
220172
symbolRemapper,
221173
stabilityInferencer,
222-
decoysEnabled,
223174
metrics,
224175
featureFlags,
225176
).lower(moduleFragment)
@@ -234,7 +185,7 @@ class ComposeIrGenerationExtension(
234185

235186
// transform calls to the currentComposer to just use the local parameter from the
236187
// previous transform
237-
ComposerIntrinsicTransformer(pluginContext, decoysEnabled).lower(moduleFragment)
188+
ComposerIntrinsicTransformer(pluginContext).lower(moduleFragment)
238189

239190
ComposableFunctionBodyTransformer(
240191
pluginContext,
@@ -246,22 +197,6 @@ class ComposeIrGenerationExtension(
246197
featureFlags,
247198
).lower(moduleFragment)
248199

249-
if (decoysEnabled) {
250-
require(idSignatureBuilder != null) {
251-
"decoys are not supported for ${pluginContext.platform}"
252-
}
253-
254-
RecordDecoySignaturesTransformer(
255-
pluginContext,
256-
symbolRemapper,
257-
idSignatureBuilder,
258-
metrics,
259-
mangler!!,
260-
stabilityInferencer,
261-
featureFlags,
262-
).lower(moduleFragment)
263-
}
264-
265200
if (isKlibTarget) {
266201
KlibAssignableParamTransformer(
267202
pluginContext,
@@ -277,9 +212,7 @@ class ComposeIrGenerationExtension(
277212
pluginContext,
278213
symbolRemapper,
279214
metrics,
280-
idSignatureBuilder,
281215
stabilityInferencer,
282-
decoysEnabled,
283216
featureFlags,
284217
).lower(moduleFragment)
285218
}

‎plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt

+3-7
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ class ComposePluginRegistrar : CompilerPluginRegistrar() {
531531
get() = true
532532

533533
override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
534-
if (checkCompilerVersion(configuration)) {
534+
if (checkCompilerConfiguration(configuration)) {
535535
val usesK2 = configuration.languageVersionSettings.languageVersion.usesK2
536536
val descriptorSerializerContext =
537537
if (usesK2) null
@@ -553,7 +553,7 @@ class ComposePluginRegistrar : CompilerPluginRegistrar() {
553553
}
554554

555555
companion object {
556-
fun checkCompilerVersion(configuration: CompilerConfiguration): Boolean {
556+
fun checkCompilerConfiguration(configuration: CompilerConfiguration): Boolean {
557557
val msgCollector = configuration.messageCollector
558558
val suppressKotlinVersionCheck = configuration.get(ComposeConfiguration.SUPPRESS_KOTLIN_VERSION_COMPATIBILITY_CHECK)
559559
if (suppressKotlinVersionCheck != null) {
@@ -568,7 +568,7 @@ class ComposePluginRegistrar : CompilerPluginRegistrar() {
568568
if (decoysEnabled) {
569569
msgCollector.report(
570570
CompilerMessageSeverity.ERROR,
571-
"Decoys generation should be disabled for Compose Multiplatform projects"
571+
"Decoys generation is no longer supported by the Compose compiler."
572572
)
573573
return false
574574
}
@@ -635,9 +635,6 @@ class ComposePluginRegistrar : CompilerPluginRegistrar() {
635635
ComposeConfiguration.NON_SKIPPING_GROUP_OPTIMIZATION_ENABLED_KEY,
636636
FeatureFlag.OptimizeNonSkippingGroups.default
637637
)
638-
val decoysEnabled = configuration.getBoolean(
639-
ComposeConfiguration.DECOYS_ENABLED_KEY,
640-
)
641638
val metricsDestination = configuration.get(
642639
ComposeConfiguration.METRICS_DESTINATION_KEY,
643640
""
@@ -714,7 +711,6 @@ class ComposePluginRegistrar : CompilerPluginRegistrar() {
714711
generateFunctionKeyMetaClasses = generateFunctionKeyMetaClasses,
715712
sourceInformationEnabled = sourceInformationEnabled,
716713
traceMarkersEnabled = traceMarkersEnabled,
717-
decoysEnabled = decoysEnabled,
718714
metricsDestination = metricsDestination,
719715
reportsDestination = reportsDestination,
720716
irVerificationMode = irVerificationMode,

‎plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt

+27-2
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ package androidx.compose.compiler.plugins.kotlin.lower
2020

2121
import androidx.compose.compiler.plugins.kotlin.*
2222
import androidx.compose.compiler.plugins.kotlin.analysis.*
23-
import androidx.compose.compiler.plugins.kotlin.lower.decoys.copyWithNewTypeParams
2423
import androidx.compose.compiler.plugins.kotlin.lower.hiddenfromobjc.hiddenFromObjCClassId
2524
import org.jetbrains.kotlin.GeneratedDeclarationKey
2625
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
2726
import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
2827
import org.jetbrains.kotlin.backend.jvm.ir.isInlineClassType
2928
import org.jetbrains.kotlin.builtins.PrimitiveType
30-
import org.jetbrains.kotlin.descriptors.ClassDescriptor
3129
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
3230
import org.jetbrains.kotlin.fir.declarations.utils.klibSourceFile
3331
import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyClass
32+
import org.jetbrains.kotlin.ir.IrElement
3433
import org.jetbrains.kotlin.ir.IrStatement
3534
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
3635
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -50,6 +49,7 @@ import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
5049
import org.jetbrains.kotlin.ir.types.impl.IrStarProjectionImpl
5150
import org.jetbrains.kotlin.ir.util.*
5251
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
52+
import org.jetbrains.kotlin.ir.visitors.acceptVoid
5353
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
5454
import org.jetbrains.kotlin.library.metadata.DeserializedSourceFile
5555
import org.jetbrains.kotlin.load.kotlin.computeJvmDescriptor
@@ -1577,3 +1577,28 @@ inline fun <T> includeFileNameInExceptionTrace(file: IrFile, body: () -> T): T {
15771577

15781578
fun FqName.topLevelName() =
15791579
asString().substringBefore(".")
1580+
1581+
internal inline fun <reified T : IrElement> T.copyWithNewTypeParams(
1582+
source: IrFunction,
1583+
target: IrFunction
1584+
): T {
1585+
val typeParamsAwareSymbolRemapper = object : DeepCopySymbolRemapper() {
1586+
init {
1587+
for ((orig, new) in source.typeParameters.zip(target.typeParameters)) {
1588+
typeParameters[orig.symbol] = new.symbol
1589+
}
1590+
}
1591+
}
1592+
val typeRemapper = DeepCopyTypeRemapper(typeParamsAwareSymbolRemapper)
1593+
val typeParamRemapper = object : TypeRemapper by typeRemapper {
1594+
override fun remapType(type: IrType): IrType {
1595+
return typeRemapper.remapType(type.remapTypeParameters(source, target))
1596+
}
1597+
}
1598+
1599+
val deepCopy = DeepCopyPreservingMetadata(typeParamsAwareSymbolRemapper, typeParamRemapper)
1600+
typeRemapper.deepCopy = deepCopy
1601+
1602+
acceptVoid(typeParamsAwareSymbolRemapper)
1603+
return transform(deepCopy, null).patchDeclarationParents(target) as T
1604+
}

‎plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package androidx.compose.compiler.plugins.kotlin.lower
2121
import androidx.compose.compiler.plugins.kotlin.*
2222
import androidx.compose.compiler.plugins.kotlin.analysis.*
2323
import androidx.compose.compiler.plugins.kotlin.lower.ComposerParamTransformer.ComposeDefaultValueStubOrigin
24-
import androidx.compose.compiler.plugins.kotlin.lower.decoys.DecoyFqNames
2524
import org.jetbrains.kotlin.backend.common.FileLoweringPass
2625
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
2726
import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
@@ -2871,8 +2870,7 @@ class ComposableFunctionBodyTransformer(
28712870
visitNormalComposableCall(expression)
28722871
}
28732872
}
2874-
ComposeFqNames.key,
2875-
DecoyFqNames.key -> visitKeyCall(expression)
2873+
ComposeFqNames.key -> visitKeyCall(expression)
28762874
else -> visitNormalComposableCall(expression)
28772875
}
28782876
}

‎plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTypeRemapper.kt

+4-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package androidx.compose.compiler.plugins.kotlin.lower
2020

2121
import androidx.compose.compiler.plugins.kotlin.hasComposableAnnotation
2222
import androidx.compose.compiler.plugins.kotlin.isComposableAnnotation
23-
import androidx.compose.compiler.plugins.kotlin.lower.decoys.isDecoy
2423
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
2524
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl
2625
import org.jetbrains.kotlin.backend.common.peek
@@ -96,7 +95,7 @@ internal class DeepCopyIrTreeWithRemappedComposableTypes(
9695
// so we potentially need to update composable types for it.
9796
// if the function is in the current module, it should be updated eventually
9897
// by this deep copy pass.
99-
if (overriddenFn.needsComposableRemapping() && !overriddenFn.isDecoy()) {
98+
if (overriddenFn.needsComposableRemapping()) {
10099
overriddenFn.remapTypes(typeRemapper)
101100
}
102101
}
@@ -412,7 +411,7 @@ class ComposerTypeRemapper(
412411
if (!name.startsWith("Function")) return false
413412
val packageFqName = cls.owner.packageFqName
414413
return packageFqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME ||
415-
packageFqName == KotlinFunctionsBuiltInsPackageFqName
414+
packageFqName == KotlinFunctionsBuiltInsPackageFqName
416415
}
417416

418417
private fun IrType.isComposableFunction(): Boolean {
@@ -422,10 +421,6 @@ class ComposerTypeRemapper(
422421
override fun remapType(type: IrType): IrType {
423422
if (type !is IrSimpleType) return type
424423
if (!type.isComposableFunction()) return underlyingRemapType(type)
425-
// do not convert types for decoys
426-
if (scopeStack.peek()?.isDecoy() == true) {
427-
return underlyingRemapType(type)
428-
}
429424

430425
val oldIrArguments = type.arguments
431426
val realParams = oldIrArguments.size - 1
@@ -442,8 +437,8 @@ class ComposerTypeRemapper(
442437
}
443438
val newIrArguments =
444439
oldIrArguments.subList(0, oldIrArguments.size - 1) +
445-
extraArgs +
446-
oldIrArguments.last()
440+
extraArgs +
441+
oldIrArguments.last()
447442

448443
val newArgSize = oldIrArguments.size - 1 + extraArgs.size
449444
val functionCls = context.function(newArgSize)

‎plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerIntrinsicTransformer.kt

+2-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package androidx.compose.compiler.plugins.kotlin.lower
2020

2121
import androidx.compose.compiler.plugins.kotlin.ComposeFqNames
22-
import androidx.compose.compiler.plugins.kotlin.lower.decoys.DecoyFqNames
2322
import org.jetbrains.kotlin.backend.common.FileLoweringPass
2423
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
2524
import org.jetbrains.kotlin.ir.declarations.IrFile
@@ -35,7 +34,6 @@ import org.jetbrains.kotlin.name.FqName
3534

3635
class ComposerIntrinsicTransformer(
3736
val context: IrPluginContext,
38-
private val decoysEnabled: Boolean
3937
) :
4038
IrElementTransformerVoid(),
4139
FileLoweringPass,
@@ -45,11 +43,7 @@ class ComposerIntrinsicTransformer(
4543

4644
// get-currentComposer gets transformed as decoy, as the getter now has additional params
4745
private fun currentComposerFqName(): FqName =
48-
if (decoysEnabled) {
49-
DecoyFqNames.CurrentComposerIntrinsic
50-
} else {
51-
ComposeFqNames.CurrentComposerIntrinsic
52-
}
46+
ComposeFqNames.CurrentComposerIntrinsic
5347

5448
override fun lower(module: IrModuleFragment) {
5549
module.transformChildrenVoid(this)
@@ -65,7 +59,7 @@ class ComposerIntrinsicTransformer(
6559
// to this call is the composer itself. We just replace this expression with the
6660
// argument expression and we are good.
6761
val expectedArgumentsCount = 1 + // composer parameter
68-
1 // changed parameter
62+
1 // changed parameter
6963
assert(expression.valueArgumentsCount == expectedArgumentsCount) {
7064
"""
7165
Composer call doesn't match expected argument count:

0 commit comments

Comments
 (0)