From 5f57368b4f95f04dec3dc799a3cbefef6f967373 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 5 May 2017 15:08:29 +0300 Subject: [PATCH] Minor: IR verifier should always check receiver descriptors --- .../kotlin/ir/AbstractIrTextTestCase.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt b/compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt index 1a315276985..c795f790340 100644 --- a/compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt +++ b/compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt @@ -142,18 +142,18 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() { checkTypeParameters(functionDescriptor, declaration, functionDescriptor.typeParameters) - declaration.dispatchReceiverParameter?.descriptor.let { dispatchReceiverDescriptor -> - if (dispatchReceiverDescriptor != functionDescriptor.dispatchReceiverParameter) { - error("$functionDescriptor: Dispatch receiver parameter mismatch: " + - "$dispatchReceiverDescriptor != ${functionDescriptor.dispatchReceiverParameter}") - } + val expectedDispatchReceiver = functionDescriptor.dispatchReceiverParameter + val actualDispatchReceiver = declaration.dispatchReceiverParameter?.descriptor + if (expectedDispatchReceiver != actualDispatchReceiver) { + error("$functionDescriptor: Dispatch receiver parameter mismatch: " + + "expected $expectedDispatchReceiver, actual $actualDispatchReceiver") } - declaration.extensionReceiverParameter?.descriptor.let { extensionReceiverDescriptor -> - if (extensionReceiverDescriptor != functionDescriptor.extensionReceiverParameter) { - error("$functionDescriptor: Extension receiver parameter mismatch: " + - "$extensionReceiverDescriptor != ${functionDescriptor.extensionReceiverParameter}") - } + val expectedExtensionReceiver = functionDescriptor.extensionReceiverParameter + val actualExtensionReceiver = declaration.extensionReceiverParameter?.descriptor + if (expectedExtensionReceiver != actualExtensionReceiver) { + error("$functionDescriptor: Extension receiver parameter mismatch: " + + "expected $expectedExtensionReceiver, actual $actualExtensionReceiver") } val declaredValueParameters = declaration.valueParameters.map { it.descriptor }