Pass CompilerConfiguration to GenerationState instead of ton of parameters

2016-05-20 12:07:35 +03:00
parent 1492c71e88
commit f8816b5d67
13 changed files with 96 additions and 129 deletions
@@ -29,6 +29,8 @@ import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.codegen.inline.InlineCache
 import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods
 import org.jetbrains.kotlin.codegen.optimization.OptimizationClassBuilderFactory
+import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.ScriptDescriptor
 import org.jetbrains.kotlin.diagnostics.Diagnostic
@@ -51,13 +53,8 @@ class GenerationState @JvmOverloads constructor(
        val module: ModuleDescriptor,
        bindingContext: BindingContext,
        val files: List<KtFile>,
-        disableCallAssertions: Boolean = true,
-        disableParamAssertions: Boolean = true,
+        val configuration: CompilerConfiguration,
        val generateDeclaredClassFilter: GenerateClassFilter = GenerationState.GenerateClassFilter.GENERATE_ALL,
-        disableInline: Boolean = false,
-        disableOptimization: Boolean = false,
-        val useTypeTableInSerializer: Boolean = false,
-        val inheritMultifileParts: Boolean = false,
        val packagesWithObsoleteParts: Collection<FqName> = emptySet(),
        val obsoleteMultifileClasses: Collection<FqName> = emptySet(),
        // for PackageCodegen in incremental compilation mode
@@ -136,22 +133,18 @@ class GenerationState @JvmOverloads constructor(
        var hasResult: Boolean = false
    }

-    val isCallAssertionsEnabled: Boolean = !disableCallAssertions
-        @JvmName("isCallAssertionsEnabled") get
-
-    val isParamAssertionsEnabled: Boolean = !disableParamAssertions
-        @JvmName("isParamAssertionsEnabled") get
-
-    val isInlineEnabled: Boolean = !disableInline
-        @JvmName("isInlineEnabled") get
-
+    val isCallAssertionsEnabled: Boolean = !configuration.get(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, false)
+    val isParamAssertionsEnabled: Boolean = !configuration.get(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, false)
+    val isInlineEnabled: Boolean = !configuration.get(JVMConfigurationKeys.DISABLE_INLINE, false)
+    val useTypeTableInSerializer: Boolean = configuration.get(JVMConfigurationKeys.USE_TYPE_TABLE, false)
+    val inheritMultifileParts: Boolean = configuration.get(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, false)

    val rootContext: CodegenContext<*> = RootContext(this)

    init {
        this.interceptedBuilderFactory = builderFactory
                .wrapWith(
-                    { OptimizationClassBuilderFactory(it, disableOptimization) },
+                    { OptimizationClassBuilderFactory(it, configuration.get(JVMConfigurationKeys.DISABLE_OPTIMIZATION, false)) },
                    { BuilderFactoryForDuplicateSignatureDiagnostics(
                            it, this.bindingContext, diagnostics, fileClassesProvider,
                            getIncrementalCacheForThisTarget(),
@@ -397,13 +397,8 @@ object KotlinToJVMBytecodeCompiler {
                result.moduleDescriptor,
                result.bindingContext,
                sourceFiles,
-                configuration.get(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, false),
-                configuration.get(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, false),
+                configuration,
                GenerationState.GenerateClassFilter.GENERATE_ALL,
-                configuration.get(JVMConfigurationKeys.DISABLE_INLINE, false),
-                configuration.get(JVMConfigurationKeys.DISABLE_OPTIMIZATION, false),
-                /* useTypeTableInSerializer = */ false,
-                configuration.get(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, false),
                packagesWithObsoleteParts,
                obsoleteMultifileClasses,
                targetId,
@@ -411,7 +406,8 @@ object KotlinToJVMBytecodeCompiler {
                outputDirectory,
                incrementalCompilationComponents,
                onIndependentPartCompilationEnd = onIndependentPartCompilationEnd,
-                dumpBinarySignatureMappingTo = configuration.get(JVMConfigurationKeys.DECLARATIONS_JSON_PATH)?.let { File(it) })
+                dumpBinarySignatureMappingTo = configuration.get(JVMConfigurationKeys.DECLARATIONS_JSON_PATH)?.let { File(it) }
+        )
        ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()

        val generationStart = PerformanceCounter.currentTime()
@@ -70,7 +70,7 @@ import java.net.URLClassLoader

 class ReplInterpreter(
        disposable: Disposable,
-        configuration: CompilerConfiguration,
+        private val configuration: CompilerConfiguration,
        private val ideMode: Boolean,
        private val replReader: ReplSystemInWrapper?
 ) {
@@ -239,7 +239,9 @@ class ReplInterpreter(
        val scriptDescriptor = doAnalyze(psiFile, errorHolder)
                               ?: return LineResult.compileError(errorHolder.renderedDiagnostics)

-        val state = GenerationState(psiFile.project, ClassBuilderFactories.BINARIES, module, trace.bindingContext, listOf(psiFile))
+        val state = GenerationState(
+                psiFile.project, ClassBuilderFactories.BINARIES, module, trace.bindingContext, listOf(psiFile), configuration
+        )

        compileScript(psiFile.script!!, earlierLines.map(EarlierLine::getScriptDescriptor), state, CompilationErrorHandler.THROW_EXCEPTION)

@@ -16,7 +16,6 @@

 package org.jetbrains.kotlin.asJava

-import com.google.common.collect.Lists
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.progress.ProcessCanceledException
@@ -40,6 +39,7 @@ import com.intellij.util.containers.Stack
 import org.jetbrains.kotlin.codegen.CompilationErrorHandler
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding
 import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider
 import org.jetbrains.kotlin.fileClasses.getFileClassType
@@ -97,13 +97,10 @@ abstract class LightClassDataProvider<T : WithFileStubAndExtraDiagnostics>(
                    KotlinLightClassBuilderFactory(stubStack),
                    context.module,
                    context.bindingContext,
-                    Lists.newArrayList(files),
-                    disableCallAssertions = false,
-                    disableParamAssertions = false,
-                    generateDeclaredClassFilter = generateClassFilter,
-                    disableInline = false,
-                    disableOptimization = false,
-                    useTypeTableInSerializer = false)
+                    files.toMutableList(),
+                    CompilerConfiguration.EMPTY,
+                    generateClassFilter
+            )
            state.beforeCompile()

            bindingContext = state.bindingContext
@@ -16,9 +16,11 @@

 package org.jetbrains.kotlin.codegen

+import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
 import org.jetbrains.kotlin.test.ConfigurationKind
@@ -33,7 +35,6 @@ abstract class AbstractDumpDeclarationsTest : CodegenTestCase() {
        compileAndCompareDump(files, expectedResult)
    }

-
    private fun compileAndCompareDump(files: List<TestFile>, expectedResult: File) {
        configurationKind = ConfigurationKind.NO_KOTLIN_REFLECT

@@ -50,19 +51,15 @@ abstract class AbstractDumpDeclarationsTest : CodegenTestCase() {
    }

    private fun compileManyFilesGetDeclarationsDump(files: List<KtFile>): File {
-        val analysisResult = JvmResolveUtil.analyzeAndCheckForErrors(files, myEnvironment)
-
-        analysisResult.throwIfError()
+        val (bindingContext, moduleDescriptor) =
+                JvmResolveUtil.analyzeAndCheckForErrors(files, myEnvironment).apply(AnalysisResult::throwIfError)

        val dumpToFile = KotlinTestUtils.tmpDirForTest(this).resolve(this.name + ".json")

        val state = GenerationState(
-                myEnvironment.project, ClassBuilderFactories.TEST,
-                analysisResult.moduleDescriptor, analysisResult.bindingContext,
-                files,
-                disableCallAssertions = false,
-                disableParamAssertions = false,
-                dumpBinarySignatureMappingTo = dumpToFile)
+                myEnvironment.project, ClassBuilderFactories.TEST, moduleDescriptor, bindingContext, files, CompilerConfiguration.EMPTY,
+                dumpBinarySignatureMappingTo = dumpToFile
+        )
        KotlinCodegenFacade.compileCorrectFiles(state, org.jetbrains.kotlin.codegen.CompilationErrorHandler.THROW_EXCEPTION)

        state.destroy()
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
-import org.jetbrains.kotlin.config.JVMConfigurationKeys;
 import org.jetbrains.kotlin.resolve.AnalyzingUtils;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -57,13 +56,7 @@ public class CodegenTestUtil {
                analysisResult.getModuleDescriptor(),
                analysisResult.getBindingContext(),
                files.getPsiFiles(),
-                configuration.get(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, false),
-                configuration.get(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, false),
-                GenerationState.GenerateClassFilter.GENERATE_ALL,
-                configuration.get(JVMConfigurationKeys.DISABLE_INLINE, false),
-                configuration.get(JVMConfigurationKeys.DISABLE_OPTIMIZATION, false),
-                /* useTypeTableInSerializer = */ false,
-                configuration.get(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, false)
+                configuration
        );

        if (analysisResult.getShouldGenerateCode()) {
@@ -66,13 +66,8 @@ public class GenerationUtils {
                CollectionsKt.first(files).getProject(), ClassBuilderFactories.TEST,
                analysisResult.getModuleDescriptor(), analysisResult.getBindingContext(),
                files,
-                configuration.get(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, false),
-                configuration.get(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, false),
+                configuration,
                GenerationState.GenerateClassFilter.GENERATE_ALL,
-                configuration.get(JVMConfigurationKeys.DISABLE_INLINE, false),
-                configuration.get(JVMConfigurationKeys.DISABLE_OPTIMIZATION, false),
-                configuration.get(JVMConfigurationKeys.USE_TYPE_TABLE, false),
-                configuration.get(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, false),
                Collections.<FqName>emptySet(),
                Collections.<FqName>emptySet(),
                null,