From 6df9919eba54fdaf7198f008cd81d670318cef34 Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Wed, 20 Jun 2018 17:38:23 +0300 Subject: [PATCH] JS IR: add DefaultContructorMarker to the runtime --- .../src/org/jetbrains/kotlin/backend/common/ir/Ir.kt | 2 +- .../test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt | 3 ++- libraries/stdlib/js/irRuntime/DefaultConstructorMarker.kt | 8 ++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 libraries/stdlib/js/irRuntime/DefaultConstructorMarker.kt diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt index 0f37a6120ed..c5b96b7c030 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt @@ -82,7 +82,7 @@ abstract class Symbols(val context: T, private val // val getProgressionLast = context.getInternalFunctions("getProgressionLast") // .map { Pair(it.returnType, symbolTable.referenceSimpleFunction(it)) }.toMap() - val defaultConstructorMarker = calc { symbolTable.referenceClass(context.getInternalClass("DefaultConstructorMarker")) } + val defaultConstructorMarker = symbolTable.referenceClass(context.getInternalClass("DefaultConstructorMarker")) val any = symbolTable.referenceClass(builtIns.any) val unit = symbolTable.referenceClass(builtIns.unit) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt index 4b83e0db418..b5dfd3568c5 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt @@ -45,8 +45,9 @@ abstract class BasicIrBoxTest( ) { val runtime = listOf( "libraries/stdlib/js/src/kotlin/core.kt", - "libraries/stdlib/js/irRuntime/exceptions.kt", "libraries/stdlib/js/irRuntime/annotations.kt", + "libraries/stdlib/js/irRuntime/DefaultConstructorMarker.kt", + "libraries/stdlib/js/irRuntime/exceptions.kt", "libraries/stdlib/js/irRuntime/internalAnnotations.kt", "libraries/stdlib/js/irRuntime/typeCheckUtils.kt" ).map { createPsiFile(it) } diff --git a/libraries/stdlib/js/irRuntime/DefaultConstructorMarker.kt b/libraries/stdlib/js/irRuntime/DefaultConstructorMarker.kt new file mode 100644 index 00000000000..6051121bf33 --- /dev/null +++ b/libraries/stdlib/js/irRuntime/DefaultConstructorMarker.kt @@ -0,0 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package kotlin.js + +internal object DefaultConstructorMarker