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

Refactor inheritMultifileParts to be a JVM analysis flag

Browse Source 
Instead of a JVMConfigurationKeys key. This will allow to use it in a
checker in 'frontend.java'
This commit is contained in:
Alexander Udalov
2019-01-23 13:18:47 +01:00
parent f3758771c9
commit 6b5a16884c
24 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
+2 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.codegen.context.FieldOwnerContext
import org.jetbrains.kotlin.codegen.context.MethodContext
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.config.IncrementalCompilation
import org.jetbrains.kotlin.config.JvmAnalysisFlags
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
@@ -80,7 +81,7 @@ class MultifileClassCodegenImpl(
.filterIsInstance<DeserializedCallableMemberDescriptor>()
private val shouldGeneratePartHierarchy =
state.inheritMultifileParts
state.languageVersionSettings.getFlag(JvmAnalysisFlags.inheritMultifileParts)
private val partInternalNamesSorted = run {
val partInternalNamesSet = hashSetOf<String>()
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
-1
View File
@@ -227,7 +227,6 @@ class GenerationState private constructor(
val assertionsMode: JVMAssertionsMode = configuration.get(JVMConfigurationKeys.ASSERTIONS_MODE, JVMAssertionsMode.DEFAULT)
val isInlineDisabled: Boolean = configuration.getBoolean(CommonConfigurationKeys.DISABLE_INLINE)
val useTypeTableInSerializer: Boolean = configuration.getBoolean(JVMConfigurationKeys.USE_TYPE_TABLE)
val inheritMultifileParts: Boolean = configuration.getBoolean(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS)
val rootContext: CodegenContext<*> = RootContext(this)
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+6 -5
View File
@@ -268,11 +268,12 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
)
result[AnalysisFlags.ignoreDataFlowInAssert] = JVMAssertionsMode.fromString(assertionsMode) != JVMAssertionsMode.LEGACY
JvmDefaultMode.fromStringOrNull(jvmDefault)?.let { result[JvmAnalysisFlags.jvmDefaultMode] = it }
?: collector.report(
CompilerMessageSeverity.ERROR,
"Unknown @JvmDefault mode: $jvmDefault, " +
"supported modes: ${JvmDefaultMode.values().map { it.description }}"
)
?: collector.report(
CompilerMessageSeverity.ERROR,
"Unknown @JvmDefault mode: $jvmDefault, " +
"supported modes: ${JvmDefaultMode.values().map { it.description }}"
)
result[JvmAnalysisFlags.inheritMultifileParts] = inheritMultifileParts
return result
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
-1
View File
@@ -390,7 +390,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
assertionsMode ?: JVMAssertionsMode.DEFAULT
)
configuration.put(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, arguments.inheritMultifileParts)
configuration.put(JVMConfigurationKeys.USE_TYPE_TABLE, arguments.useTypeTable)
configuration.put(JVMConfigurationKeys.SKIP_RUNTIME_VERSION_CHECK, arguments.skipRuntimeVersionCheck)
configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, !arguments.useOldClassFilesReading)
compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
-2
View File
@@ -69,8 +69,6 @@ public class JVMConfigurationKeys {
CompilerConfigurationKey.create("do not throw NPE on explicit 'equals' call for null receiver of platform boxed primitive type");
public static final CompilerConfigurationKey<Boolean> DISABLE_OPTIMIZATION =
CompilerConfigurationKey.create("disable optimization");
public static final CompilerConfigurationKey<Boolean> INHERIT_MULTIFILE_PARTS =
CompilerConfigurationKey.create("compile multifile classes to a hierarchy of parts and facade");
public static final CompilerConfigurationKey<Boolean> USE_TYPE_TABLE =
CompilerConfigurationKey.create("use type table in serializer");
compiler/frontend.java/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
+3
View File
@@ -14,4 +14,7 @@ object JvmAnalysisFlags {
@JvmStatic
val jvmDefaultMode by AnalysisFlag.Delegates.JvmDefaultModeDisabledByDefault
@JvmStatic
val inheritMultifileParts by AnalysisFlag.Delegates.Boolean
}
compiler/testData/codegen/box/multifileClasses/optimized/callableRefToFun.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/callableRefToInternalValInline.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/callableRefToPrivateVal.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/callableRefToVal.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/calls.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: Baz.java
public class Baz {
compiler/testData/codegen/box/multifileClasses/optimized/deferredStaticInitialization.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/delegatedVal.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/initializePrivateVal.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/initializePublicVal.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/overlappingFuns.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/overlappingVals.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/valAccessFromInlineFunCalledFromJava.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/valAccessFromInlinedToDifferentPackage.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/box/multifileClasses/optimized/valWithAccessor.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// TARGET_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: box.kt
import a.*
compiler/testData/codegen/boxInline/multifileClasses/inlineFromOptimizedMultifileClass.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// IGNORE_BACKEND: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: 1.kt
@file:[JvmName("MultifileClass") JvmMultifileClass]
compiler/testData/codegen/bytecodeText/multifileClasses/optimizedMultifileClassFacadeMethods.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// IGNORE_BACKEND: JVM_IR
// KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS
// !INHERIT_MULTIFILE_PARTS
// FILE: bar.kt
@file:JvmName("Util")
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt
+6 -2
View File
@@ -21,6 +21,7 @@ const val IGNORE_DATA_FLOW_IN_ASSERT_DIRECTIVE = "IGNORE_DATA_FLOW_IN_ASSERT"
const val JVM_DEFAULT_MODE = "JVM_DEFAULT_MODE"
const val SKIP_METADATA_VERSION_CHECK = "SKIP_METADATA_VERSION_CHECK"
const val ALLOW_RESULT_RETURN_TYPE = "ALLOW_RESULT_RETURN_TYPE"
const val INHERIT_MULTIFILE_PARTS = "INHERIT_MULTIFILE_PARTS"
data class CompilerTestLanguageVersionSettings(
private val initialLanguageFeatures: Map<LanguageFeature, LanguageFeature.State>,
@@ -59,9 +60,11 @@ fun parseLanguageVersionSettings(directiveMap: Map<String, String>): CompilerTes
val enableJvmDefault = directiveMap[JVM_DEFAULT_MODE]?.let { JvmAnalysisFlags.jvmDefaultMode to JvmDefaultMode.fromStringOrNull(it)!! }
val skipMetadataVersionCheck = AnalysisFlags.skipMetadataVersionCheck to directiveMap.containsKey(SKIP_METADATA_VERSION_CHECK)
val allowResultReturnType = AnalysisFlags.allowResultReturnType to directiveMap.containsKey(ALLOW_RESULT_RETURN_TYPE)
val inheritMultifileParts = JvmAnalysisFlags.inheritMultifileParts to directiveMap.containsKey(INHERIT_MULTIFILE_PARTS)
if (apiVersionString == null && languageFeaturesString == null && experimental == null && useExperimental == null &&
!ignoreDataFlowInAssert.second && enableJvmDefault == null && !skipMetadataVersionCheck.second && !allowResultReturnType.second
!ignoreDataFlowInAssert.second && enableJvmDefault == null && !skipMetadataVersionCheck.second && !allowResultReturnType.second &&
!inheritMultifileParts.second
) {
return null
}
@@ -77,7 +80,8 @@ fun parseLanguageVersionSettings(directiveMap: Map<String, String>): CompilerTes
languageFeatures, apiVersion, languageVersion,
mapOf(
*listOfNotNull(
experimental, useExperimental, enableJvmDefault, ignoreDataFlowInAssert, skipMetadataVersionCheck, allowResultReturnType
experimental, useExperimental, enableJvmDefault, ignoreDataFlowInAssert, skipMetadataVersionCheck, allowResultReturnType,
inheritMultifileParts
).toTypedArray()
)
)
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+6 -6
View File
@@ -207,17 +207,17 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
}
}
if (explicitLanguageVersionSettings != null) {
CommonConfigurationKeysKt.setLanguageVersionSettings(configuration, explicitLanguageVersionSettings);
}
else if (disableReleaseCoroutines) {
CompilerTestLanguageVersionSettings compilerLanguageVersionSettings = new CompilerTestLanguageVersionSettings(
if (disableReleaseCoroutines) {
explicitLanguageVersionSettings = new CompilerTestLanguageVersionSettings(
Collections.singletonMap(LanguageFeature.ReleaseCoroutines, LanguageFeature.State.DISABLED),
ApiVersion.LATEST_STABLE,
LanguageVersion.LATEST_STABLE,
Collections.emptyMap()
);
CommonConfigurationKeysKt.setLanguageVersionSettings(configuration, compilerLanguageVersionSettings);
}
if (explicitLanguageVersionSettings != null) {
CommonConfigurationKeysKt.setLanguageVersionSettings(configuration, explicitLanguageVersionSettings);
}
updateConfigurationWithFlags(configuration, kotlinConfigurationFlags);