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

Descriptor return type must coincide with expression return type

Browse Source
This commit is contained in:
Konstantin Anisimov
2017-04-17 12:08:01 +07:00
committed by KonstantinAnisimov
parent 5920e0d8ba
commit 0f24850f3c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDescriptoros.kt
+9 -6
View File
@@ -383,11 +383,12 @@ internal class DeepCopyIrTreeWithDescriptors(val targetDescriptor: DeclarationDe
override fun visitCall(expression: IrCall): IrCall { override fun visitCall(expression: IrCall): IrCall {
if (expression !is IrCallImpl) return super.visitCall(expression) if (expression !is IrCallImpl) return super.visitCall(expression)
val newDescriptor = mapCallee(expression.descriptor)
return IrCallImpl( return IrCallImpl(
startOffset = expression.startOffset, startOffset = expression.startOffset,
endOffset = expression.endOffset, endOffset = expression.endOffset,
type = substituteType(expression.type)!!, type = newDescriptor.returnType!!,
descriptor = mapCallee(expression.descriptor), descriptor = newDescriptor,
typeArguments = substituteTypeArguments(expression.getTypeArgumentsMap()), typeArguments = substituteTypeArguments(expression.getTypeArgumentsMap()),
origin = expression.origin, origin = expression.origin,
superQualifier = mapSuperQualifier(expression.superQualifier) superQualifier = mapSuperQualifier(expression.superQualifier)
@@ -419,15 +420,17 @@ internal class DeepCopyIrTreeWithDescriptors(val targetDescriptor: DeclarationDe
//---------------------------------------------------------------------// //---------------------------------------------------------------------//
override fun visitCallableReference(expression: IrCallableReference): IrCallableReference = override fun visitCallableReference(expression: IrCallableReference): IrCallableReference {
IrCallableReferenceImpl( val newDescriptor = mapCallableReference(expression.descriptor)
return IrCallableReferenceImpl(
startOffset = expression.startOffset, startOffset = expression.startOffset,
endOffset = expression.endOffset, endOffset = expression.endOffset,
type = substituteType(expression.type)!!, type = newDescriptor.returnType!!,
descriptor = mapCallableReference(expression.descriptor), descriptor = newDescriptor,
typeArguments = expression.getTypeArgumentsMap(), typeArguments = expression.getTypeArgumentsMap(),
origin = mapStatementOrigin(expression.origin) origin = mapStatementOrigin(expression.origin)
).transformValueArguments(expression) ).transformValueArguments(expression)
}
//---------------------------------------------------------------------// //---------------------------------------------------------------------//