From 04e5cbb5d3fcc1d5c8002b920d6038a7feda7d74 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 31 Aug 2015 21:17:39 +0300 Subject: [PATCH] Convert some GenerationState functions to values --- .../kotlin/codegen/state/GenerationState.kt | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt index 718003c2b01..e2bdffa3838 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt @@ -43,10 +43,10 @@ public class GenerationState( public val module: ModuleDescriptor, bindingContext: BindingContext, public val files: List, - private val disableCallAssertions: Boolean, - private val disableParamAssertions: Boolean, + disableCallAssertions: Boolean, + disableParamAssertions: Boolean, public val generateDeclaredClassFilter: GenerationState.GenerateClassFilter, - private val disableInline: Boolean, + disableInline: Boolean, disableOptimization: Boolean, public val packagesWithObsoleteParts: Collection = emptySet(), // for PackageCodegen in incremental compilation mode @@ -89,6 +89,15 @@ public class GenerationState( public val jvmRuntimeTypes: JvmRuntimeTypes = JvmRuntimeTypes() private val interceptedBuilderFactory: ClassBuilderFactory + public val isCallAssertionsEnabled: Boolean = !disableCallAssertions + @jvmName("isCallAssertionsEnabled") get + + public val isParamAssertionsEnabled: Boolean = !disableParamAssertions + @jvmName("isParamAssertionsEnabled") get + + public val isInlineEnabled: Boolean = !disableInline + @jvmName("isInlineEnabled") get + public constructor( project: Project, builderFactory: ClassBuilderFactory, @@ -116,12 +125,6 @@ public class GenerationState( this.factory = ClassFileFactory(this, interceptedBuilderFactory) } - public fun isCallAssertionsEnabled(): Boolean = !disableCallAssertions - - public fun isParamAssertionsEnabled(): Boolean = !disableParamAssertions - - public fun isInlineEnabled(): Boolean = !disableInline - public fun beforeCompile() { markUsed()