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

Move GenerationState properties' initialization to declaration

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-07-16 20:04:54 +03:00
parent de23f7ace8
commit 6e0332d418
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+8 -20
View File
@@ -75,18 +75,18 @@ public class GenerationState(
} }
private var used = false private var used = false
public val classBuilderMode: ClassBuilderMode public val classBuilderMode: ClassBuilderMode = builderFactory.getClassBuilderMode()
public val bindingContext: BindingContext public val bindingTrace: BindingTrace = DelegatingBindingTrace(bindingContext, "trace in GenerationState")
public val bindingContext: BindingContext = bindingTrace.getBindingContext()
public val typeMapper: JetTypeMapper = JetTypeMapperWithOutDirectory(this.bindingContext, classBuilderMode, outDirectory)
public val factory: ClassFileFactory public val factory: ClassFileFactory
public val intrinsics: IntrinsicMethods public val intrinsics: IntrinsicMethods = IntrinsicMethods()
public val samWrapperClasses: SamWrapperClasses = SamWrapperClasses(this) public val samWrapperClasses: SamWrapperClasses = SamWrapperClasses(this)
public val inlineCycleReporter: InlineCycleReporter public val inlineCycleReporter: InlineCycleReporter = InlineCycleReporter(diagnostics)
public val mappingsClassesForWhenByEnum: MappingsClassesForWhenByEnum = MappingsClassesForWhenByEnum(this) public val mappingsClassesForWhenByEnum: MappingsClassesForWhenByEnum = MappingsClassesForWhenByEnum(this)
public val bindingTrace: BindingTrace
public val typeMapper: JetTypeMapper
public var earlierScriptsForReplInterpreter: List<ScriptDescriptor>? = null public var earlierScriptsForReplInterpreter: List<ScriptDescriptor>? = null
public val reflectionTypes: ReflectionTypes public val reflectionTypes: ReflectionTypes = ReflectionTypes(module)
public val jvmRuntimeTypes: JvmRuntimeTypes public val jvmRuntimeTypes: JvmRuntimeTypes = JvmRuntimeTypes()
private val interceptedBuilderFactory: ClassBuilderFactory private val interceptedBuilderFactory: ClassBuilderFactory
public constructor( public constructor(
@@ -100,13 +100,6 @@ public class GenerationState(
init { init {
var builderFactory = builderFactory var builderFactory = builderFactory
this.classBuilderMode = builderFactory.getClassBuilderMode()
this.bindingTrace = DelegatingBindingTrace(bindingContext, "trace in GenerationState")
this.bindingContext = bindingTrace.getBindingContext()
this.typeMapper = JetTypeMapperWithOutDirectory(this.bindingContext, classBuilderMode, outDirectory)
this.intrinsics = IntrinsicMethods()
builderFactory = OptimizationClassBuilderFactory(builderFactory, disableOptimization) builderFactory = OptimizationClassBuilderFactory(builderFactory, disableOptimization)
@@ -121,11 +114,6 @@ public class GenerationState(
this.interceptedBuilderFactory = interceptedBuilderFactory this.interceptedBuilderFactory = interceptedBuilderFactory
this.factory = ClassFileFactory(this, interceptedBuilderFactory) this.factory = ClassFileFactory(this, interceptedBuilderFactory)
this.reflectionTypes = ReflectionTypes(module)
this.jvmRuntimeTypes = JvmRuntimeTypes()
this.inlineCycleReporter = InlineCycleReporter(diagnostics)
} }
public fun isCallAssertionsEnabled(): Boolean = !disableCallAssertions public fun isCallAssertionsEnabled(): Boolean = !disableCallAssertions