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

[JS IR] added a directive to skip IC checks in IR

Browse Source
This commit is contained in:
Anton Bannykh
2021-10-05 18:53:37 +03:00
committed by teamcityserver
parent 94ed6a1dbd
commit c2f7ed2fff
20 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+7 -3
View File
@@ -176,6 +176,8 @@ abstract class BasicBoxTest(
RuntimeDiagnostic.resolve(safeExternalBooleanDiagnosticMatcher.group(1))
else null
val skipIcChecks = targetBackend == TargetBackend.JS_IR && SKIP_IR_INCREMENTAL_CHECKS.matcher(fileContent).find()
TestFileFactoryImpl().use { testFactory ->
val inputFiles = TestFiles.createTestFiles(
file.name,
@@ -191,7 +193,7 @@ abstract class BasicBoxTest(
return dependenciesSymbols.toSet() + dependenciesSymbols.flatMap { modules[it]!!.allTransitiveDependencies() }
}
val checkIC = modules.any { it.value.hasFilesToRecompile }
val checkIC = !skipIcChecks && modules.any { it.value.hasFilesToRecompile }
val orderedModules = DFS.topologicalOrder(modules.values) { module -> module.dependenciesSymbols.mapNotNull { modules[it] } }
@@ -410,7 +412,7 @@ abstract class BasicBoxTest(
if (!skipRegularMode) {
runGeneratedCode(allJsFiles, testModuleName, testPackage, testFunction, expectedResult, withModuleSystem)
if (runIrDce) {
if (runIrDce && !checkIC) {
runGeneratedCode(dceAllJsFiles, testModuleName, testPackage, testFunction, expectedResult, withModuleSystem)
}
}
@@ -650,7 +652,7 @@ abstract class BasicBoxTest(
customTestModule,
)
if (incrementalCompilationChecksEnabled && module.hasFilesToRecompile) {
if (checkIC && incrementalCompilationChecksEnabled && module.hasFilesToRecompile) {
checkIncrementalCompilation(
sourceDirs,
module,
@@ -1264,6 +1266,8 @@ abstract class BasicBoxTest(
private val SAFE_EXTERNAL_BOOLEAN = Pattern.compile("^// *SAFE_EXTERNAL_BOOLEAN *$", Pattern.MULTILINE)
private val SAFE_EXTERNAL_BOOLEAN_DIAGNOSTIC = Pattern.compile("^// *SAFE_EXTERNAL_BOOLEAN_DIAGNOSTIC: *(.+)$", Pattern.MULTILINE)
private val SKIP_IR_INCREMENTAL_CHECKS = Pattern.compile("^// *SKIP_IR_INCREMENTAL_CHECKS *$", Pattern.MULTILINE)
@JvmStatic
protected val runTestInNashorn = getBoolean("kotlin.js.useNashorn")
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+12 -11
View File
@@ -584,18 +584,19 @@ abstract class BasicIrBoxTest(
val cacheProvider = icCache.cacheProvider()
val newBinaryAsts = dirtyFiles.associateWith { cacheProvider.binaryAst(it) }
for (file in dirtyFiles) {
val oldBinaryAst = oldBinaryAsts[file]
val newBinaryAst = newBinaryAsts[file]
// TODO: enable asserts when binary stability is achieved
// for (file in dirtyFiles) {
// val oldBinaryAst = oldBinaryAsts[file]
// val newBinaryAst = newBinaryAsts[file]
//
// assert(oldBinaryAst.contentEquals(newBinaryAst)) { "Binary AST changed after recompilation for file $file" }
}
if (isMainModule) {
val originalOutput = FileUtil.loadFile(outputFile)
val recompiledOutput = FileUtil.loadFile(recompiledOutputFile)
assertEquals("Output file changed after recompilation", originalOutput, recompiledOutput)
}
// }
//
// if (isMainModule) {
// val originalOutput = FileUtil.loadFile(outputFile)
// val recompiledOutput = FileUtil.loadFile(recompiledOutputFile)
// assertEquals("Output file changed after recompilation", originalOutput, recompiledOutput)
// }
}
private fun jsOutputSink(perFileOutputDir: File): CompilerOutputSink {