From 6670180782f404a09e0e96bd1c98c50b9d3b9b3b Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Thu, 1 Aug 2019 14:45:57 +0300 Subject: [PATCH] [JS IR BE] Use internal visibility for generated helper methods --- .../kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt | 3 ++- .../kotlin/ir/backend/js/lower/CallableReferenceLowering.kt | 2 +- .../kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt index e95be193448..9fa8c92f0e7 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.DeclarationContainerLoweringPass import org.jetbrains.kotlin.backend.common.ir.isElseBranch +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext @@ -69,7 +70,7 @@ abstract class AbstractBlockDecomposerLowering(context: CommonBackendContext) : irField.name.asString() + "\$init\$", expression.type, container, - irField.visibility + Visibilities.PRIVATE ) val newBody = toBlockBody(initFunction) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt index f9534cafbbf..82b6db6732e 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt @@ -426,7 +426,7 @@ class CallableReferenceLowering(val context: JsIrBackendContext) : FileLoweringP val boundValueParameters = receivers + declaration.valueParameters.filter { it.origin == BOUND_VALUE_PARAMETER } - val factoryDeclaration = JsIrBuilder.buildFunction(getterName, reference.type, implicitDeclarationFile, declaration.visibility) + val factoryDeclaration = JsIrBuilder.buildFunction(getterName, reference.type, implicitDeclarationFile, Visibilities.INTERNAL) for ((i, p) in boundValueParameters.withIndex()) { val descriptor = WrappedValueParameterDescriptor() diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt index 68c70727514..81f5660dd42 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.common.ir.copyTo import org.jetbrains.kotlin.backend.common.ir.copyTypeParametersFrom import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext @@ -147,7 +148,7 @@ private fun buildInitDeclaration(constructor: IrConstructor, irClass: IrClass): functionName, type, constructor.parent, - constructor.visibility, + Visibilities.INTERNAL, Modality.FINAL, constructor.isInline, constructor.isExternal