From da8dacb4959ab424e464185b4ed75fde23ce13df Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 7 Dec 2020 20:04:06 +0300 Subject: [PATCH] [JS IR] run RemoveInlineFunctionsWithReifiedTypeParametersLowering earlier It's required to avoid extracting local classes declarations and leaking some references to inline function internals. --- .../org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt index 7b66b386d04..cfe8f7ba1a5 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -704,6 +704,7 @@ val loweringList = listOf( localClassesExtractionFromInlineFunctionsPhase, functionInliningPhase, copyInlineFunctionBodyLoweringPhase, + removeInlineFunctionsWithReifiedTypeParametersLoweringPhase, createScriptFunctionsPhase, callableReferenceLowering, singleAbstractMethodPhase, @@ -750,7 +751,6 @@ val loweringList = listOf( defaultParameterInjectorPhase, defaultParameterCleanerPhase, jsDefaultCallbackGeneratorPhase, - removeInlineFunctionsWithReifiedTypeParametersLoweringPhase, throwableSuccessorsLoweringPhase, es6AddInternalParametersToConstructorPhase, es6ConstructorLowering,