From 487419e76228867e01a2a6efeea7123a1bf8d64f Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 25 Jan 2017 20:32:23 +0300 Subject: [PATCH] KJS: don't export inline functions with `InlineOnly` annotation and inline functions with reified generic parameter --- .../kotlin/js/translate/context/DeclarationExporter.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt index 05ab81d8b1f..f99989d2d2b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/DeclarationExporter.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.js.translate.context import org.jetbrains.kotlin.js.backend.ast.metadata.staticRef import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.annotations.isInlineOnlyOrReifiable import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isLibraryObject @@ -39,6 +40,7 @@ internal class DeclarationExporter(val context: StaticContext) { if (exportedDeclarations.contains(descriptor)) return if (descriptor is ConstructorDescriptor && descriptor.isPrimary) return if (isNativeObject(descriptor) || isLibraryObject(descriptor)) return + if (descriptor.isInlineOnlyOrReifiable()) return val suggestedName = context.nameSuggestion.suggest(descriptor) ?: return