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

[K/N][driver] Some tweaks in IrValidator setup

Browse Source
This commit is contained in:
Igor Chevdar
2023-02-09 13:29:49 +02:00
committed by Space Team
parent 95c4ded9d0
commit 4fd063bd4b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/utilities/IrPassesUtilities.kt
+4 -6
View File
@@ -60,18 +60,18 @@ private fun <Context : PhaseContext, Data> getIrValidator(): Action<Data, Contex
val backendContext: CommonBackendContext? = findBackendContext(context) val backendContext: CommonBackendContext? = findBackendContext(context)
if (backendContext == null) { if (backendContext == null) {
context.messageCollector.report(CompilerMessageSeverity.WARNING, context.messageCollector.report(CompilerMessageSeverity.LOGGING,
"Cannot verify IR ${state.beforeOrAfter} ${state.phase}: insufficient context.") "Cannot verify IR ${state.beforeOrAfter} ${state.phase}: insufficient context.")
return return
} }
val element = findKotlinBackendIr(context, data) val element = findKotlinBackendIr(context, data)
if (element == null) { if (element == null) {
context.messageCollector.report(CompilerMessageSeverity.WARNING, context.messageCollector.report(CompilerMessageSeverity.LOGGING,
"Cannot verify IR ${state.beforeOrAfter} ${state.phase}: IR not found.") "Cannot verify IR ${state.beforeOrAfter} ${state.phase}: IR not found.")
return return
} }
val validatorConfig = IrValidatorConfig( val validatorConfig = IrValidatorConfig(
abortOnError = false, abortOnError = true,
ensureAllNodesAreDifferent = true, ensureAllNodesAreDifferent = true,
checkTypes = true, checkTypes = true,
checkDescriptors = false checkDescriptors = false
@@ -105,12 +105,10 @@ private fun <Data, Context : PhaseContext> getIrDumper(): Action<Data, Context>
defaultDumper(state, element, backendContext) defaultDumper(state, element, backendContext)
} }
private val validateAll = false
/** /**
* IR dump and verify actions. * IR dump and verify actions.
*/ */
internal fun <Data, Context : PhaseContext> getDefaultIrActions(): Set<Action<Data, Context>> = setOfNotNull( internal fun <Data, Context : PhaseContext> getDefaultIrActions(): Set<Action<Data, Context>> = setOfNotNull(
getIrDumper(), getIrDumper(),
getIrValidator<Context, Data>().takeIf { validateAll } getIrValidator<Context, Data>()
) )