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

[JS IR BE] support multimodule tests

Browse Source
This commit is contained in:
Anton Bannykh
2018-09-17 14:17:29 +03:00
parent 2e709a81fa
commit 0660e4d616
70 changed files with 37 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt
+3 -4
View File
@@ -49,10 +49,11 @@ fun compile(
files: List<KtFile>,
configuration: CompilerConfiguration,
export: FqName? = null,
dependencies: List<Result> = listOf()
dependencies: List<ModuleDescriptor> = listOf(),
irDependencyModules: List<IrModuleFragment> = listOf()
): Result {
val analysisResult =
TopDownAnalyzerFacadeForJS.analyzeFiles(files, project, configuration, dependencies.mapNotNull { it.moduleDescriptor as? ModuleDescriptorImpl }, emptyList())
TopDownAnalyzerFacadeForJS.analyzeFiles(files, project, configuration, dependencies.mapNotNull { it as? ModuleDescriptorImpl }, emptyList())
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
@@ -61,8 +62,6 @@ fun compile(
val psi2IrTranslator = Psi2IrTranslator(configuration.languageVersionSettings)
val psi2IrContext = psi2IrTranslator.createGeneratorContext(analysisResult.moduleDescriptor, analysisResult.bindingContext)
val irDependencyModules = dependencies.map { it.moduleFragment.deepCopyWithSymbols() }
irDependencyModules.forEach { psi2IrContext.symbolTable.loadModule(it)}
val moduleFragment = psi2IrTranslator.generateModuleFragment(psi2IrContext, files)
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ArrayInlineConstructorLowering.kt
+1 -3
View File
@@ -6,15 +6,13 @@
package org.jetbrains.kotlin.ir.backend.js.lower
import org.jetbrains.kotlin.backend.common.FileLoweringPass
import org.jetbrains.kotlin.builtins.PrimitiveType
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
import org.jetbrains.kotlin.ir.backend.js.ir.irCall
import org.jetbrains.kotlin.ir.declarations.IrConstructor
import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.expressions.IrCall
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt
+14 -7
View File
@@ -37,22 +37,31 @@ class SecondaryCtorLowering(val context: JsIrBackendContext) {
fun getConstructorProcessorLowering() = object : DeclarationContainerLoweringPass {
override fun lower(irDeclarationContainer: IrDeclarationContainer) {
irDeclarationContainer.declarations.transformFlat {
if (it is IrClass) {
listOf(it) + lowerClass(it)
} else null
}
irDeclarationContainer.declarations.filterIsInstance<IrClass>().forEach { lowerClass(it) }
}
}::runOnFilePostfix
fun getConstructorRedirectorLowering() = object : DeclarationContainerLoweringPass {
override fun lower(irDeclarationContainer: IrDeclarationContainer) {
if (irDeclarationContainer is IrClass) {
updateConstructorDeclarations(irDeclarationContainer)
}
for (it in irDeclarationContainer.declarations) {
it.accept(CallsiteRedirectionTransformer(), null)
}
}
}::runOnFilePostfix
private fun updateConstructorDeclarations(irClass: IrClass) {
irClass.declarations.transformFlat {
if (it is IrConstructor) {
oldCtorToNewMap[it.symbol]?.let { (newInit, newCreate) ->
listOf(newInit.owner, newCreate.owner)
}
} else null
}
}
private fun lowerClass(irClass: IrClass): List<IrSimpleFunction> {
val className = irClass.name.asString()
val oldConstructors = mutableListOf<IrConstructor>()
@@ -91,8 +100,6 @@ class SecondaryCtorLowering(val context: JsIrBackendContext) {
}
}
irClass.declarations.removeAll(oldConstructors)
return newConstructors
}
compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bound/emptyLHS.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// !LANGUAGE: +ReleaseCoroutines
// !API_VERSION: 1.3
// IGNORE_BACKEND: NATIVE
// IGNORE_BACKEND: JS, JS_IR
// IGNORE_BACKEND: JS
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND: NATIVE
// WITH_COROUTINES
compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// MODULE: lib
// FILE: lib.kt
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_COROUTINES
// WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_COROUTINES
// WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_COROUTINES
// WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND: NATIVE
// WITH_COROUTINES
compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/simple.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_COROUTINES
compiler/testData/codegen/box/inlineClasses/unboxValueFromPlatformType.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// WITH_RUNTIME
// IGNORE_BACKEND: JVM_IR, JS_IR, NATIVE
// IGNORE_BACKEND: JVM_IR, NATIVE
inline class SnekDirection(val direction: Int) {
companion object {
compiler/testData/codegen/box/publishedApi/simple.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// MODULE: lib
// FILE: lib.kt
class A {
compiler/testData/codegen/box/publishedApi/topLevel.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// MODULE: lib
// FILE: lib.kt
@PublishedApi
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromCatchBlock.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND: JS_IR
// MODULE: lib
// FILE: lib.kt
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnToCatchBlock.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// MODULE: lib
// FILE: lib.kt