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

[FIR] Restore UPPER_BOUND_VIOLATED and TYPE_VARIANCE_CONFLICT as errors, fix TestStep.kt

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-08-09 15:36:29 +03:00
parent d670743a2f
commit c1afb6354b
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/TestStep.kt
+4 -4
View File
@@ -15,7 +15,7 @@ sealed class TestStep<I : ResultingArtifact<I>, O : ResultingArtifact<O>> {
return inputArtifact.kind == inputArtifactKind
}
abstract fun processModule(module: TestModule, inputArtifact: I, thereWereExceptionsOnPreviousSteps: Boolean): StepResult<O>
abstract fun processModule(module: TestModule, inputArtifact: I, thereWereExceptionsOnPreviousSteps: Boolean): StepResult<out O>
class FacadeStep<I : ResultingArtifact<I>, O : ResultingArtifact<O>>(val facade: AbstractTestFacade<I, O>) : TestStep<I, O>() {
override val inputArtifactKind: TestArtifactKind<I>
@@ -28,7 +28,7 @@ sealed class TestStep<I : ResultingArtifact<I>, O : ResultingArtifact<O>> {
return super.shouldProcessModule(module, inputArtifact) && facade.shouldRunAnalysis(module)
}
override fun processModule(module: TestModule, inputArtifact: I, thereWereExceptionsOnPreviousSteps: Boolean): StepResult<O> {
override fun processModule(module: TestModule, inputArtifact: I, thereWereExceptionsOnPreviousSteps: Boolean): StepResult<out O> {
val outputArtifact = try {
facade.transform(module, inputArtifact) ?: return StepResult.NoArtifactFromFacade
} catch (e: Throwable) {
@@ -69,8 +69,8 @@ sealed class TestStep<I : ResultingArtifact<I>, O : ResultingArtifact<O>> {
}
}
sealed class StepResult<out O : ResultingArtifact<out O>> {
class Artifact<out O : ResultingArtifact<out O>>(val outputArtifact: O) : StepResult<O>()
sealed class StepResult<O : ResultingArtifact<O>> {
class Artifact<O : ResultingArtifact<O>>(val outputArtifact: O) : StepResult<O>()
class ErrorFromFacade<O : ResultingArtifact<O>>(val exception: WrappedException) : StepResult<O>()
data class HandlersResult(
val exceptionsFromHandlers: Collection<WrappedException>,