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

Specify default value for irBackend

Browse Source
This commit is contained in:
Mikhael Bogdanov
2019-03-05 11:01:59 +01:00
parent a3c3282362
commit cc0c3b1592
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
+1 -2
View File
@@ -19,8 +19,7 @@ class KotlinToJvmSignatureMapperImpl : KotlinToJvmSignatureMapper {
private val typeMapper = KotlinTypeMapper(
BindingContext.EMPTY, ClassBuilderMode.LIGHT_CLASSES,
IncompatibleClassTracker.DoNothing, JvmAbi.DEFAULT_MODULE_NAME, JvmTarget.DEFAULT,
KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings
false
KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings
)
override fun mapToJvmMethodSignature(function: FunctionDescriptor) = typeMapper.mapAsmMethod(function)
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt
+2 -2
View File
@@ -82,8 +82,8 @@ class KotlinTypeMapper @JvmOverloads constructor(
private val moduleName: String,
val jvmTarget: JvmTarget,
private val languageVersionSettings: LanguageVersionSettings,
private val isIrBackend: Boolean,
private val typePreprocessor: Function1<KotlinType, KotlinType>? = null
private val isIrBackend: Boolean = false,
private val typePreprocessor: Function1<KotlinType, KotlinType?>? = null
) {
private val isReleaseCoroutines = languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines)
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt
+1 -2
View File
@@ -345,8 +345,7 @@ abstract class FileRankingCalculator(private val checkClassFqName: Boolean = tru
private fun makeTypeMapper(bindingContext: BindingContext): KotlinTypeMapper {
return KotlinTypeMapper(
bindingContext, ClassBuilderMode.LIGHT_CLASSES, IncompatibleClassTracker.DoNothing, "debugger", JvmTarget.DEFAULT,
KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings
false
KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings
)
}
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt
+1 -2
View File
@@ -184,8 +184,7 @@ class ParcelableDeclarationChecker : DeclarationChecker {
IncompatibleClassTracker.DoNothing,
descriptor.module.name.asString(),
JvmTarget.DEFAULT,
languageVersionSettings,
false
languageVersionSettings
)
for (parameter in primaryConstructor?.valueParameters.orEmpty()) {
plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt
+1 -2
View File
@@ -49,8 +49,7 @@ class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService {
return KotlinTypeMapper(
getBindingContext(element), ClassBuilderMode.LIGHT_CLASSES,
IncompatibleClassTracker.DoNothing, JvmAbi.DEFAULT_MODULE_NAME, JvmTarget.DEFAULT,
element.languageVersionSettings,
false
element.languageVersionSettings
)
}
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt
+1 -2
View File
@@ -62,8 +62,7 @@ class UastAnalysisHandlerExtension : AnalysisHandlerExtension {
val typeMapper = KotlinTypeMapper(
bindingContext, ClassBuilderMode.LIGHT_CLASSES,
IncompatibleClassTracker.DoNothing, JvmAbi.DEFAULT_MODULE_NAME, JvmTarget.DEFAULT,
KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT, // TODO use proper LanguageVersionSettings
false
KotlinTypeMapper.LANGUAGE_VERSION_SETTINGS_DEFAULT // TODO use proper LanguageVersionSettings
)
this.typeMapper = typeMapper
return typeMapper