azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parcelize: do not copy call in ParcelizeIrTransformer

Browse Source 
This is just a refactoring/optimization that makes use of the fact that
IrCall.symbol and IrFunctionReference.symbol are now mutable.
This commit is contained in:
Alexander Udalov
2023-06-17 00:08:05 +02:00
committed by Space Team
parent b75aa9af4e
commit 755d140e16
2 changed files with 35 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ir/ParcelableIrTransformer.kt
+16 -29
View File
@@ -16,24 +16,19 @@ import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.IrStatement
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.builders.*
import org.jetbrains.kotlin.ir.builders.declarations.*
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
import org.jetbrains.kotlin.ir.expressions.IrCall
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrFunctionReference
import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
@@ -57,40 +52,32 @@ class ParcelableIrTransformer(private val context: IrPluginContext, private val
deferredOperations.forEach { it() }
// Remap broken stubs, which psi2ir generates for the synthetic descriptors coming from the ParcelizeResolveExtension.
moduleFragment.transformChildrenVoid(object : IrElementTransformerVoid() {
override fun visitCall(expression: IrCall): IrExpression {
val remappedSymbol = symbolMap[expression.symbol]
?: return super.visitCall(expression)
return IrCallImpl(
expression.startOffset, expression.endOffset, expression.type, remappedSymbol,
expression.typeArgumentsCount, expression.valueArgumentsCount, expression.origin,
expression.superQualifierSymbol
).apply {
copyTypeAndValueArgumentsFrom(expression)
}
moduleFragment.acceptChildrenVoid(object : IrElementVisitorVoid {
override fun visitElement(element: IrElement) {
element.acceptChildren(this, null)
}
override fun visitFunctionReference(expression: IrFunctionReference): IrExpression {
override fun visitCall(expression: IrCall) {
expression.acceptChildren(this, null)
expression.symbol = symbolMap[expression.symbol] ?: return
}
override fun visitFunctionReference(expression: IrFunctionReference) {
expression.acceptChildren(this, null)
val remappedSymbol = symbolMap[expression.symbol]
val remappedReflectionTarget = expression.reflectionTarget?.let { symbolMap[it] }
if (remappedSymbol == null && remappedReflectionTarget == null)
return super.visitFunctionReference(expression)
if (remappedSymbol == null && remappedReflectionTarget == null) return
return IrFunctionReferenceImpl(
expression.startOffset, expression.endOffset, expression.type, remappedSymbol ?: expression.symbol,
expression.typeArgumentsCount, expression.valueArgumentsCount, remappedReflectionTarget,
expression.origin
).apply {
copyTypeAndValueArgumentsFrom(expression)
}
expression.symbol = remappedSymbol ?: expression.symbol
expression.reflectionTarget = remappedReflectionTarget
}
override fun visitSimpleFunction(declaration: IrSimpleFunction): IrStatement {
override fun visitSimpleFunction(declaration: IrSimpleFunction) {
declaration.acceptChildren(this, null)
// Remap overridden symbols, otherwise the code might break in BridgeLowering
declaration.overriddenSymbols = declaration.overriddenSymbols.map { symbol ->
symbolMap[symbol] ?: symbol
}
return super.visitSimpleFunction(declaration)
}
})
}