[IR] Mark IrValueParameterImpl with an opt-in annotation
KT-59318
This commit is contained in:
Sergej Jaskiewicz
committed by
Space Team
Space Team
parent
b56a04e796
commit
f482b6a458
+25
-19
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
|
||||
import org.jetbrains.kotlin.ir.declarations.*
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
|
||||
import org.jetbrains.kotlin.ir.descriptors.IrAbstractDescriptorBasedFunctionFactory
|
||||
import org.jetbrains.kotlin.ir.linkage.IrProvider
|
||||
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
|
||||
@@ -264,12 +263,19 @@ internal class BuiltInFictitiousFunctionIrClassFactory(
|
||||
).apply {
|
||||
parent = functionClass
|
||||
valueParameters += invokeFunctionDescriptor.valueParameters.map {
|
||||
IrValueParameterImpl(
|
||||
SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, DECLARATION_ORIGIN_FUNCTION_CLASS,
|
||||
IrValueParameterSymbolImpl(it), it.name, it.index,
|
||||
functionClass.typeParameters[it.index].defaultType, null,
|
||||
it.isCrossinline, it.isNoinline,
|
||||
isHidden = false, isAssignable = false
|
||||
symbolTable.irFactory.createValueParameter(
|
||||
startOffset = SYNTHETIC_OFFSET,
|
||||
endOffset = SYNTHETIC_OFFSET,
|
||||
origin = DECLARATION_ORIGIN_FUNCTION_CLASS,
|
||||
name = it.name,
|
||||
type = functionClass.typeParameters[it.index].defaultType,
|
||||
isAssignable = false,
|
||||
symbol = IrValueParameterSymbolImpl(it),
|
||||
index = it.index,
|
||||
varargElementType = null,
|
||||
isCrossinline = it.isCrossinline,
|
||||
isNoinline = it.isNoinline,
|
||||
isHidden = false,
|
||||
).also { it.parent = this }
|
||||
}
|
||||
if (!isFakeOverride)
|
||||
@@ -316,19 +322,19 @@ internal class BuiltInFictitiousFunctionIrClassFactory(
|
||||
|
||||
private fun IrFunction.createValueParameter(descriptor: ParameterDescriptor): IrValueParameter {
|
||||
val varargType = if (descriptor is ValueParameterDescriptor) descriptor.varargElementType else null
|
||||
return IrValueParameterImpl(
|
||||
offset,
|
||||
offset,
|
||||
memberOrigin,
|
||||
IrValueParameterSymbolImpl(descriptor),
|
||||
descriptor.name,
|
||||
descriptor.indexOrMinusOne,
|
||||
toIrType(descriptor.type),
|
||||
varargType?.let { toIrType(it) },
|
||||
descriptor.isCrossinline,
|
||||
descriptor.isNoinline,
|
||||
return symbolTable.irFactory.createValueParameter(
|
||||
startOffset = offset,
|
||||
endOffset = offset,
|
||||
origin = memberOrigin,
|
||||
name = descriptor.name,
|
||||
type = toIrType(descriptor.type),
|
||||
isAssignable = false,
|
||||
symbol = IrValueParameterSymbolImpl(descriptor),
|
||||
index = descriptor.indexOrMinusOne,
|
||||
varargElementType = varargType?.let { toIrType(it) },
|
||||
isCrossinline = descriptor.isCrossinline,
|
||||
isNoinline = descriptor.isNoinline,
|
||||
isHidden = false,
|
||||
isAssignable = false
|
||||
).also {
|
||||
it.parent = this
|
||||
}
|
||||
|
||||
+18
-17
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
|
||||
import org.jetbrains.kotlin.ir.builders.*
|
||||
import org.jetbrains.kotlin.ir.declarations.*
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
|
||||
import org.jetbrains.kotlin.ir.expressions.*
|
||||
import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
|
||||
import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
|
||||
@@ -1157,18 +1156,19 @@ private class ObjCBlockPointerValuePassing(
|
||||
)
|
||||
irClass.addChild(constructor)
|
||||
|
||||
val constructorParameter = IrValueParameterImpl(
|
||||
startOffset, endOffset,
|
||||
OBJC_BLOCK_FUNCTION_IMPL,
|
||||
IrValueParameterSymbolImpl(),
|
||||
Name.identifier("blockPointer"),
|
||||
0,
|
||||
symbols.nativePtrType,
|
||||
val constructorParameter = context.irFactory.createValueParameter(
|
||||
startOffset = startOffset,
|
||||
endOffset = endOffset,
|
||||
origin = OBJC_BLOCK_FUNCTION_IMPL,
|
||||
name = Name.identifier("blockPointer"),
|
||||
type = symbols.nativePtrType,
|
||||
isAssignable = false,
|
||||
symbol = IrValueParameterSymbolImpl(),
|
||||
index = 0,
|
||||
varargElementType = null,
|
||||
isCrossinline = false,
|
||||
isNoinline = false,
|
||||
isHidden = false,
|
||||
isAssignable = false
|
||||
)
|
||||
constructor.valueParameters += constructorParameter
|
||||
constructorParameter.parent = constructor
|
||||
@@ -1208,18 +1208,19 @@ private class ObjCBlockPointerValuePassing(
|
||||
invokeMethod.createDispatchReceiverParameter()
|
||||
|
||||
invokeMethod.valueParameters += (0 until parameterCount).map { index ->
|
||||
val parameter = IrValueParameterImpl(
|
||||
startOffset, endOffset,
|
||||
OBJC_BLOCK_FUNCTION_IMPL,
|
||||
IrValueParameterSymbolImpl(),
|
||||
Name.identifier("p$index"),
|
||||
index,
|
||||
functionType.arguments[index].typeOrNull!!,
|
||||
val parameter = context.irFactory.createValueParameter(
|
||||
startOffset = startOffset,
|
||||
endOffset = endOffset,
|
||||
origin = OBJC_BLOCK_FUNCTION_IMPL,
|
||||
name = Name.identifier("p$index"),
|
||||
type = functionType.arguments[index].typeOrNull!!,
|
||||
isAssignable = false,
|
||||
symbol = IrValueParameterSymbolImpl(),
|
||||
index = index,
|
||||
varargElementType = null,
|
||||
isCrossinline = false,
|
||||
isNoinline = false,
|
||||
isHidden = false,
|
||||
isAssignable = false
|
||||
)
|
||||
parameter.parent = invokeMethod
|
||||
parameter
|
||||
|
||||
+10
-7
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.ir.builders.*
|
||||
import org.jetbrains.kotlin.ir.builders.declarations.buildVariable
|
||||
import org.jetbrains.kotlin.ir.declarations.*
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
|
||||
import org.jetbrains.kotlin.ir.expressions.IrExpression
|
||||
import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
|
||||
import org.jetbrains.kotlin.ir.expressions.impl.IrTryImpl
|
||||
@@ -81,15 +80,19 @@ internal class KotlinBridgeBuilder(
|
||||
fun addParameter(type: IrType): IrValueParameter {
|
||||
val index = counter++
|
||||
|
||||
return IrValueParameterImpl(
|
||||
bridge.startOffset, bridge.endOffset, bridge.origin,
|
||||
IrValueParameterSymbolImpl(),
|
||||
Name.identifier("p$index"), index, type,
|
||||
null,
|
||||
return irBuilder.context.irFactory.createValueParameter(
|
||||
startOffset = bridge.startOffset,
|
||||
endOffset = bridge.endOffset,
|
||||
origin = bridge.origin,
|
||||
name = Name.identifier("p$index"),
|
||||
type = type,
|
||||
isAssignable = false,
|
||||
symbol = IrValueParameterSymbolImpl(),
|
||||
index = index,
|
||||
varargElementType = null,
|
||||
isCrossinline = false,
|
||||
isNoinline = false,
|
||||
isHidden = false,
|
||||
isAssignable = false
|
||||
).apply {
|
||||
parent = bridge
|
||||
bridge.valueParameters += this
|
||||
|
||||
+8
-8
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
|
||||
import org.jetbrains.kotlin.ir.builders.*
|
||||
import org.jetbrains.kotlin.ir.builders.declarations.buildFun
|
||||
import org.jetbrains.kotlin.ir.declarations.*
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
|
||||
import org.jetbrains.kotlin.ir.expressions.IrBlockBody
|
||||
import org.jetbrains.kotlin.ir.expressions.IrCall
|
||||
import org.jetbrains.kotlin.ir.expressions.IrExpression
|
||||
@@ -148,18 +147,19 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain
|
||||
)
|
||||
|
||||
runtimeJobFunction.valueParameters +=
|
||||
IrValueParameterImpl(
|
||||
startOffset, endOffset,
|
||||
IrDeclarationOrigin.DEFINED,
|
||||
IrValueParameterSymbolImpl(),
|
||||
arg.name,
|
||||
arg.index,
|
||||
context.irFactory.createValueParameter(
|
||||
startOffset = startOffset,
|
||||
endOffset = endOffset,
|
||||
origin = IrDeclarationOrigin.DEFINED,
|
||||
name = arg.name,
|
||||
type = context.irBuiltIns.anyNType,
|
||||
isAssignable = arg.isAssignable,
|
||||
symbol = IrValueParameterSymbolImpl(),
|
||||
index = arg.index,
|
||||
varargElementType = null,
|
||||
isCrossinline = arg.isCrossinline,
|
||||
isNoinline = arg.isNoinline,
|
||||
isHidden = arg.isHidden,
|
||||
isAssignable = arg.isAssignable
|
||||
)
|
||||
}
|
||||
val overriddenJobDescriptor = OverriddenFunctionInfo(jobFunction, runtimeJobFunction)
|
||||
|
||||
+9
-9
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.descriptors.ClassKind
|
||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
|
||||
import org.jetbrains.kotlin.ir.IrStatement
|
||||
import org.jetbrains.kotlin.ir.declarations.*
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
|
||||
import org.jetbrains.kotlin.ir.expressions.*
|
||||
import org.jetbrains.kotlin.ir.expressions.impl.*
|
||||
import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
|
||||
@@ -124,18 +123,19 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas
|
||||
}
|
||||
|
||||
fun createSynthesizedValueParameter(index: Int, name: String, type: IrType): IrValueParameter =
|
||||
IrValueParameterImpl(
|
||||
startOffset, endOffset,
|
||||
DECLARATION_ORIGIN_ENUM,
|
||||
IrValueParameterSymbolImpl(),
|
||||
Name.identifier(name),
|
||||
index,
|
||||
type,
|
||||
context.irFactory.createValueParameter(
|
||||
startOffset = startOffset,
|
||||
endOffset = endOffset,
|
||||
origin = DECLARATION_ORIGIN_ENUM,
|
||||
name = Name.identifier(name),
|
||||
type = type,
|
||||
isAssignable = false,
|
||||
symbol = IrValueParameterSymbolImpl(),
|
||||
index = index,
|
||||
varargElementType = null,
|
||||
isCrossinline = false,
|
||||
isNoinline = false,
|
||||
isHidden = false,
|
||||
isAssignable = false
|
||||
).apply {
|
||||
parent = loweredConstructor
|
||||
}
|
||||
|
||||
+9
-9
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.ir.IrStatement
|
||||
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
|
||||
import org.jetbrains.kotlin.ir.builders.*
|
||||
import org.jetbrains.kotlin.ir.declarations.*
|
||||
import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
|
||||
import org.jetbrains.kotlin.ir.expressions.*
|
||||
import org.jetbrains.kotlin.ir.expressions.impl.*
|
||||
import org.jetbrains.kotlin.ir.objcinterop.*
|
||||
@@ -387,18 +386,19 @@ private class InteropLoweringPart1(val generationState: NativeGenerationState) :
|
||||
)
|
||||
|
||||
newFunction.valueParameters += parameterTypes.mapIndexed { index, type ->
|
||||
IrValueParameterImpl(
|
||||
function.startOffset, function.endOffset,
|
||||
IrDeclarationOrigin.DEFINED,
|
||||
IrValueParameterSymbolImpl(),
|
||||
Name.identifier("p$index"),
|
||||
index,
|
||||
type,
|
||||
context.irFactory.createValueParameter(
|
||||
startOffset = function.startOffset,
|
||||
endOffset = function.endOffset,
|
||||
origin = IrDeclarationOrigin.DEFINED,
|
||||
name = Name.identifier("p$index"),
|
||||
type = type,
|
||||
isAssignable = false,
|
||||
symbol = IrValueParameterSymbolImpl(),
|
||||
index = index,
|
||||
varargElementType = null,
|
||||
isCrossinline = false,
|
||||
isNoinline = false,
|
||||
isHidden = false,
|
||||
isAssignable = false
|
||||
).apply {
|
||||
parent = newFunction
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user