azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS IR BE] Reflection support

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2018-08-05 13:09:31 +03:00
parent 1471fe08d7
commit 392ad521fd
75 changed files with 563 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+24 -13
View File
@@ -5,10 +5,7 @@
package org.jetbrains.kotlin.js.test
import org.jetbrains.kotlin.config.ApiVersion
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
import org.jetbrains.kotlin.config.languageVersionSettings
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.ir.backend.js.Result
import org.jetbrains.kotlin.ir.backend.js.compile
import org.jetbrains.kotlin.js.config.JsConfig
@@ -24,9 +21,11 @@ private val runtimeSources = listOfKtFilesFrom(
"libraries/stdlib/js/src/kotlin/jsTypeOf.kt",
"libraries/stdlib/js/src/kotlin/dynamic.kt",
"libraries/stdlib/js/src/kotlin/annotations.kt",
"libraries/stdlib/js/src/kotlin/reflect",
"libraries/stdlib/js/src/kotlin/annotationsJVM.kt",
"libraries/stdlib/src/kotlin/internal/Annotations.kt",
"libraries/stdlib/src/kotlin/internal",
"libraries/stdlib/src/kotlin/util/Standard.kt",
"core/builtins/native/kotlin/Annotation.kt",
"core/builtins/native/kotlin/Number.kt",
"core/builtins/native/kotlin/Comparable.kt",
@@ -39,9 +38,14 @@ private val runtimeSources = listOfKtFilesFrom(
"core/builtins/src/kotlin/Range.kt",
"core/builtins/src/kotlin/Ranges.kt",
"core/builtins/src/kotlin/Unit.kt",
"core/builtins/src/kotlin/reflect",
"core/builtins/src/kotlin/Function.kt",
"core/builtins/native/kotlin/Collections.kt",
"core/builtins/native/kotlin/Iterator.kt",
"libraries/stdlib/common/src/kotlin/JvmAnnotationsH.kt",
"libraries/stdlib/js/irRuntime",
BasicBoxTest.COMMON_FILES_DIR_PATH
)
@@ -85,13 +89,20 @@ abstract class BasicIrBoxTest(
// TODO: split input files to some parts (global common, local common, test)
.filterNot { it.virtualFilePath.contains(BasicBoxTest.COMMON_FILES_DIR_PATH) }
val runtimeConfiguration = config.configuration.copy()
// TODO: is it right in general? Maybe sometimes we need to compile with newer versions or with additional language features.
runtimeConfiguration.languageVersionSettings = LanguageVersionSettingsImpl(
LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE,
specificFeatures = mapOf(
LanguageFeature.AllowContractsForCustomFunctions to LanguageFeature.State.ENABLED,
LanguageFeature.MultiPlatformProjects to LanguageFeature.State.ENABLED
)
)
if (runtimeResult == null) {
val myConfiguration = config.configuration.copy()
// TODO: is it right in general? Maybe sometimes we need to compile with newer versions or with additional language features.
myConfiguration.languageVersionSettings = LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE)
runtimeResult = compile(config.project, runtimeSources.map(::createPsiFile), myConfiguration)
runtimeResult = compile(config.project, runtimeSources.map(::createPsiFile), runtimeConfiguration)
runtimeFile.write(runtimeResult!!.generatedCode)
}
@@ -101,7 +112,7 @@ abstract class BasicIrBoxTest(
compile(
config.project,
allFiles,
config.configuration,
runtimeConfiguration,
FqName((testPackage?.let { "$it." } ?: "") + testFunction))
} else {
compile(
js/js.translator/testData/box/char/charInStringTemplate.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1114
package foo
import kotlin.test.assertEquals
js/js.translator/testData/box/expression/cast/checkThrowCCE.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1094
package foo
js/js.translator/testData/box/inline/extension.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1122
/*
* Copy of JVM-backend test
js/js.translator/testData/box/inlineMultiFile/with.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1131
/*
* Copy of JVM-backend test
js/js.translator/testData/box/inlineStdlib/callNameClash.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1127
package foo
js/js.translator/testData/box/inlineStdlib/localNamesClash.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1115
package foo
js/js.translator/testData/box/inlineStdlib/thisInExtension.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1116
package foo
js/js.translator/testData/box/labels/labelOnExpression.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1122
// CHECK_LABELS_COUNT: function=test0 count=0
// CHECK_LABELS_COUNT: function=test1 count=0
js/js.translator/testData/box/nameClashes/withBuiltin.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1135
open class C {
private fun constructor() = "C.constructor"
js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1111
//FILE: nativeClassAsReifiedTypeArgument.kt
js/js.translator/testData/box/reflection/external.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1099
external class A
js/js.translator/testData/box/reflection/jsClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1169
package foo
js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1165
package foo
js/js.translator/testData/box/reflection/jsClassSimpleName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1177
package foo
js/js.translator/testData/box/reflection/kClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1168
package foo
js/js.translator/testData/box/reflection/kClassIsInstance.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1177
package foo
js/js.translator/testData/box/reflection/kClassOnReifiedType.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1165
package foo
js/js.translator/testData/box/reflection/kClassSimpleName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1177
package foo