From 576dfda3a847a6169f636f6c220f5a54d24bad63 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 21 Jun 2018 21:57:06 +0300 Subject: [PATCH] IrTypes: fix translating for `Dynamic` type (cherry picked from commit bd04b46) --- .../ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt index 4525285ef03..2a30e128ac9 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt @@ -59,8 +59,8 @@ class TypeTranslator( when { ktTypeUpper.isError -> return IrErrorTypeImpl(ktTypeUpper, translateTypeAnnotations(ktTypeUpper.annotations), variance) - ktTypeUpper.isFlexible() -> return translateType(ktTypeUpper.upperIfFlexible(), variance) ktTypeUpper.isDynamic() -> return IrDynamicTypeImpl(ktTypeUpper, translateTypeAnnotations(ktTypeUpper.annotations), variance) + ktTypeUpper.isFlexible() -> return translateType(ktTypeUpper.upperIfFlexible(), variance) } val ktTypeConstructor = ktTypeUpper.constructor