Skip to content

Commit b687d4c

Browse files
erokhinsSpace
authored andcommitted
Fix binary compatibility with AS Arctic Fox C14
(cherry picked from commit e0a834d)
1 parent 06f7a3d commit b687d4c

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ class GenerationState private constructor(
256256
this.moduleName,
257257
languageVersionSettings,
258258
useOldManglingSchemeForFunctionsWithInlineClassesInSignatures,
259+
IncompatibleClassTracker.DoNothing,
259260
target,
260261
isIrBackend
261262
)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
3+
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
4+
*/
5+
6+
package org.jetbrains.kotlin.codegen.state
7+
8+
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
9+
10+
interface IncompatibleClassTracker {
11+
fun record(binaryClass: KotlinJvmBinaryClass)
12+
13+
object DoNothing : IncompatibleClassTracker {
14+
override fun record(binaryClass: KotlinJvmBinaryClass) {
15+
}
16+
}
17+
}

compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ class KotlinTypeMapper @JvmOverloads constructor(
8787
private val moduleName: String,
8888
val languageVersionSettings: LanguageVersionSettings,
8989
private val useOldInlineClassesManglingScheme: Boolean,
90+
// temporary returned to preserve binary compatibility with Dagger in IDE
91+
// https://android.googlesource.com/platform/tools/adt/idea/+/refs/heads/mirror-goog-studio-master-dev/dagger/src/com/android/tools/idea/dagger/DaggerAnnotatedElementsSearch.kt
92+
private val incompatibleClassTracker: IncompatibleClassTracker = IncompatibleClassTracker.DoNothing,
9093
val jvmTarget: JvmTarget = JvmTarget.DEFAULT,
9194
private val isIrBackend: Boolean = false,
9295
private val typePreprocessor: ((KotlinType) -> KotlinType?)? = null,

0 commit comments

Comments
 (0)