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

[FIR] Fir2IrJsResultsConverter: Compute hasErrors of backend input

Browse Source 
- This allows us to re-enable 3 tests.
This commit is contained in:
Marco Pennekamp
2022-11-30 17:54:28 +01:00
committed by Space Team
parent 49c3ba33f1
commit dbb02a9bfb
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxError/semantic/castToErrorType.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// IGNORE_ERRORS
// ERROR_POLICY: SEMANTIC
// IGNORE_BACKEND_K2: JS_IR
// MODULE: lib
// FILE: t.kt
compiler/testData/codegen/boxError/semantic/reifiedNonInline.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// IGNORE_ERRORS
// ERROR_POLICY: SEMANTIC
// IGNORE_BACKEND_K2: JS_IR
// MODULE: lib
// FILE: t.kt
compiler/testData/codegen/boxError/syntax/arrowReference.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// IGNORE_ERRORS
// ERROR_POLICY: SYNTAX
// IGNORE_BACKEND_K2: JS_IR
// MODULE: lib
// FILE: t.kt
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt
+6 -1
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.config.languageVersionSettings
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.fir.AbstractFirAnalyzerFacade
import org.jetbrains.kotlin.fir.FirAnalyzerFacade
import org.jetbrains.kotlin.fir.FirSession
@@ -79,12 +80,16 @@ class Fir2IrJsResultsConverter(
configuration.get(CommonConfigurationKeys.METADATA_VERSION)
?: GenerationState.LANGUAGE_TO_METADATA_VERSION.getValue(module.languageVersionSettings.languageVersion)
// At this point, checkers will already have been run by a previous test step. `runCheckers` returns the cached diagnostics map.
val diagnosticsMap = inputArtifact.firAnalyzerFacade.runCheckers()
val hasErrors = diagnosticsMap.any { entry -> entry.value.any { it.severity == Severity.ERROR } }
return IrBackendInput.JsIrBackendInput(
irModuleFragment,
sourceFiles,
icData,
expectDescriptorToSymbol,
hasErrors = false // TODO: implement error check
hasErrors,
) { file ->
val firFile = firFilesBySourceFile[file] ?: error("cannot find FIR file by source file ${file.name} (${file.path})")
serializeSingleFirFile(firFile, components.session, components.scopeSession, metadataVersion)