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

KotlinMangler: added IrType.isInlined

Browse Source 
Added possibility to specify when IrType corresponds to an inline class
This commit is contained in:
Igor Chevdar
2019-05-14 18:55:39 +03:00
parent 8e579855f2
commit b060acf01d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
+2 -2
View File
@@ -21,7 +21,7 @@ interface KotlinMangler {
val IrDeclaration.hashedMangle: Long val IrDeclaration.hashedMangle: Long
fun IrDeclaration.isExported(): Boolean fun IrDeclaration.isExported(): Boolean
val IrFunction.functionName: String val IrFunction.functionName: String
val IrType.isInlined: Boolean
} }
abstract class KotlinManglerImpl: KotlinMangler { abstract class KotlinManglerImpl: KotlinMangler {
@@ -155,7 +155,7 @@ abstract class KotlinManglerImpl: KotlinMangler {
val signatureSuffix = val signatureSuffix =
when { when {
this.typeParameters.isNotEmpty() -> "Generic" this.typeParameters.isNotEmpty() -> "Generic"
returnType.isInlined() -> "ValueType" returnType.isInlined -> "ValueType"
!returnType.isUnitOrNullableUnit() -> typeToHashString(returnType) !returnType.isUnitOrNullableUnit() -> typeToHashString(returnType)
else -> "" else -> ""
} }
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsMangler.kt
+5
View File
@@ -6,9 +6,14 @@
package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir
import org.jetbrains.kotlin.backend.common.serialization.KotlinManglerImpl import org.jetbrains.kotlin.backend.common.serialization.KotlinManglerImpl
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.util.isInlined
object JsMangler: KotlinManglerImpl() { object JsMangler: KotlinManglerImpl() {
// TODO: think about this // TODO: think about this
override val String.hashMangle: Long get() = this.hashCode().toLong() override val String.hashMangle: Long get() = this.hashCode().toLong()
override val IrType.isInlined: Boolean
get() = this.isInlined()
} }