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

React to review comments

Browse Source
This commit is contained in:
Georgy Bronnikov
2018-11-26 16:05:47 +03:00
parent c9343c89bc
commit c018109bca
14 changed files with 72 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt
+1 -1
View File
@@ -22,7 +22,7 @@ class RenderIrElementWithDescriptorsVisitor : IrElementVisitor<String, Nothing?>
"MODULE_FRAGMENT ${declaration.descriptor}"
override fun visitFile(declaration: IrFile, data: Nothing?): String =
"FILE ${declaration.name}"
"FILE ${declaration.path}"
override fun visitFunction(declaration: IrFunction, data: Nothing?): String =
"FUN ${declaration.descriptor}"
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
+12 -16
View File
@@ -155,8 +155,7 @@ val IrFunctionReference.isSuspend get() = (symbol.owner as? IrSimpleFunction)?.i
fun IrValueParameter.copyTo(
irFunction: IrFunction,
shift: Int = 0,
index: Int? = null,
index: Int = this.index,
startOffset: Int = this.startOffset,
endOffset: Int = this.endOffset,
origin: IrDeclarationOrigin = this.origin,
@@ -164,16 +163,13 @@ fun IrValueParameter.copyTo(
type: IrType = this.type.remapTypeParameters(this.parent as IrTypeParametersContainer, irFunction),
varargElementType: IrType? = this.varargElementType
): IrValueParameter {
// You cannot specify both index and nontrivial shift.
assert(index == null || shift == 0)
val newIndex = index ?: (shift + this.index)
val descriptor = WrappedValueParameterDescriptor(symbol.descriptor.annotations, symbol.descriptor.source)
val symbol = IrValueParameterSymbolImpl(descriptor)
val defaultValueCopy = defaultValue?.deepCopyWithVariables()
defaultValueCopy?.patchDeclarationParents(irFunction)
return IrValueParameterImpl(
startOffset, endOffset, origin, symbol,
name, newIndex, type, varargElementType, isCrossinline, isNoinline
name, index, type, varargElementType, isCrossinline, isNoinline
).also {
descriptor.bind(it)
it.parent = irFunction
@@ -208,7 +204,7 @@ fun IrFunction.copyParameterDeclarationsFrom(from: IrFunction) {
extensionReceiverParameter = from.extensionReceiverParameter?.copyTo(this)
val shift = valueParameters.size
valueParameters += from.valueParameters.map { it.copyTo(this, shift) }
valueParameters += from.valueParameters.map { it.copyTo(this, index = it.index + shift) }
}
fun IrTypeParametersContainer.copyTypeParametersFrom(
@@ -246,22 +242,22 @@ fun IrFunction.copyValueParametersToStatic(
assert(target.valueParameters.isEmpty())
var shift = 0
source.dispatchReceiverParameter?.apply {
source.dispatchReceiverParameter?.let { p ->
target.valueParameters.add(
copyTo(
p.copyTo(
target,
origin = origin,
shift = shift++,
origin = p.origin,
index = p.index + shift++,
name = Name.identifier("\$this")
)
)
}
source.extensionReceiverParameter?.apply {
source.extensionReceiverParameter?.let { p ->
target.valueParameters.add(
copyTo(
p.copyTo(
target,
origin = origin,
shift = shift++,
origin = p.origin,
index = p.index + shift++,
name = Name.identifier("\$receiver")
)
)
@@ -271,7 +267,7 @@ fun IrFunction.copyValueParametersToStatic(
oldValueParameter.copyTo(
target,
origin = origin,
shift = shift
index = oldValueParameter.index + shift
)
)
}
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt
+4 -4
View File
@@ -132,8 +132,8 @@ open class DefaultArgumentStubGenerator constructor(val context: CommonBackendCo
symbol = irFunction.symbol, descriptor = irFunction.symbol.descriptor,
typeArgumentsCount = irFunction.typeParameters.size
).apply {
(0 until typeArgumentsCount).forEach { i ->
putTypeArgument(i, newIrFunction.typeParameters[i].defaultType)
newIrFunction.typeParameters.forEachIndexed { i, param ->
putTypeArgument(i, param.defaultType)
}
dispatchReceiver = newIrFunction.dispatchReceiverParameter?.let { irGet(it) }
@@ -141,8 +141,8 @@ open class DefaultArgumentStubGenerator constructor(val context: CommonBackendCo
}
} else {
+irReturn(irCall(irFunction).apply {
(0 until typeArgumentsCount).forEach { i ->
putTypeArgument(i, newIrFunction.typeParameters[i].defaultType)
newIrFunction.typeParameters.forEachIndexed { i, param ->
putTypeArgument(i, param.defaultType)
}
dispatchReceiver = newIrFunction.dispatchReceiverParameter?.let { irGet(it) }
extensionReceiver = newIrFunction.extensionReceiverParameter?.let { irGet(it) }
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt
+3 -3
View File
@@ -255,10 +255,10 @@ class InlineClassLowering(val context: BackendContext) {
dispatchReceiverParameter = null
extensionReceiverParameter = function.extensionReceiverParameter?.copyTo(this)
if (function is IrSimpleFunction) {
valueParameters.add(function.dispatchReceiverParameter!!.copyTo(this, shift = 1))
valueParameters += function.valueParameters.map { p -> p.copyTo(this, shift = 1) }
valueParameters.add(function.dispatchReceiverParameter!!.let { p -> p.copyTo(this, index = p.index + 1) })
valueParameters += function.valueParameters.map { p -> p.copyTo(this, index = p.index + 1) }
} else {
valueParameters += function.valueParameters.map { p -> p.copyTo(this, shift = 0) }
valueParameters += function.valueParameters.map { p -> p.copyTo(this) }
}
parent = function.parent
assert(isStaticMethodOfClass)
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+1 -1
View File
@@ -554,7 +554,7 @@ class LocalDeclarationsLowering(
}
oldDeclaration.valueParameters.mapTo(this) { v ->
v.copyTo(newDeclaration, capturedValues.size).also {
v.copyTo(newDeclaration, index = v.index + capturedValues.size).also {
newParameterToOld.putAbsentOrSame(it, v)
}
}