Fix hidden compile issues.

touchlab · Aug 27, 2024 · ff246a3 · ff246a3
1 parent 5e6ad3f
commit ff246a3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/...1.8.0..2.0.0/kotlin/co/touchlab/skie/kir/irbuilder/impl/symboltable/DummyIrConstructor.kt b/...1.8.0..2.0.0/kotlin/co/touchlab/skie/kir/irbuilder/impl/symboltable/DummyIrConstructor.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ
 
 actual class DummyIrConstructor actual constructor(override val symbol: IrConstructorSymbol) : IrConstructor() {
 
-    override var isPrimary: Boolean by unsupported()
+    actual override var isPrimary: Boolean by unsupported()
     override val startOffset: Int by unsupported()
     override val endOffset: Int by unsupported()
     override val factory: IrFactory by unsupported()
@@ -35,13 +35,13 @@ actual class DummyIrConstructor actual constructor(override val symbol: IrConstr
     override val descriptor: ClassConstructorDescriptor by unsupported()
     override var dispatchReceiverParameter: IrValueParameter? by unsupported()
     override var extensionReceiverParameter: IrValueParameter? by unsupported()
-    override var isExpect: Boolean by unsupported()
-    override var isInline: Boolean by unsupported()
+    actual override var isExpect: Boolean by unsupported()
+    actual override var isInline: Boolean by unsupported()
     override var returnType: IrType by unsupported()
     override var valueParameters: List<IrValueParameter> by unsupported()
     override val containerSource: DeserializedContainerSource? by unsupported()
     override var metadata: MetadataSource? by unsupported()
     override var annotations: List<IrConstructorCall> by unsupported()
-    override var isExternal: Boolean by unsupported()
+    actual override var isExternal: Boolean by unsupported()
     override var typeParameters: List<IrTypeParameter> by unsupported()
 }
diff --git a/...1.8.0..2.0.0/kotlin/co/touchlab/skie/kir/type/translation/KirDeclarationTypeTranslator.kt b/...1.8.0..2.0.0/kotlin/co/touchlab/skie/kir/type/translation/KirDeclarationTypeTranslator.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.backend.konan.binaryRepresentationIsNullable
 import org.jetbrains.kotlin.backend.konan.objcexport.ObjCValueType
 import org.jetbrains.kotlin.types.KotlinType
 
-actual fun ObjCValueType.mapToOir(kotlinType: KotlinType): OirType =
+internal actual fun ObjCValueType.mapToOir(kotlinType: KotlinType): OirType =
     when (this) {
         ObjCValueType.BOOL -> PrimitiveOirType.BOOL
         ObjCValueType.UNICHAR -> PrimitiveOirType.unichar

diff --git a/...0/kotlin/co/touchlab/skie/kir/irbuilder/impl/symboltable/DummyIrConstructor.kgp_2.0.20.kt b/...0/kotlin/co/touchlab/skie/kir/irbuilder/impl/symboltable/DummyIrConstructor.kgp_2.0.20.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ
 
 actual class DummyIrConstructor actual constructor(override val symbol: IrConstructorSymbol) : IrConstructor() {
 
-    override var isPrimary: Boolean by unsupported()
+    actual override var isPrimary: Boolean by unsupported()
     override val startOffset: Int by unsupported()
     override val endOffset: Int by unsupported()
     override val factory: IrFactory by unsupported()
@@ -32,13 +32,13 @@ actual class DummyIrConstructor actual constructor(override val symbol: IrConstr
     override val descriptor: ClassConstructorDescriptor by unsupported()
     override var dispatchReceiverParameter: IrValueParameter? by unsupported()
     override var extensionReceiverParameter: IrValueParameter? by unsupported()
-    override var isExpect: Boolean by unsupported()
-    override var isInline: Boolean by unsupported()
+    actual override var isExpect: Boolean by unsupported()
+    actual override var isInline: Boolean by unsupported()
     override var returnType: IrType by unsupported()
     override var valueParameters: List<IrValueParameter> by unsupported()
     override val containerSource: DeserializedContainerSource? by unsupported()
     override var metadata: MetadataSource? by unsupported()
     override var annotations: List<IrConstructorCall> by unsupported()
-    override var isExternal: Boolean by unsupported()
+    actual override var isExternal: Boolean by unsupported()
     override var typeParameters: List<IrTypeParameter> by unsupported()
 }
diff --git a/...c/kgp_common/kotlin/co/touchlab/skie/kir/irbuilder/impl/symboltable/DummyIrConstructor.kt b/...c/kgp_common/kotlin/co/touchlab/skie/kir/irbuilder/impl/symboltable/DummyIrConstructor.kt
@@ -3,4 +3,9 @@ package co.touchlab.skie.kir.irbuilder.impl.symboltable
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 
-expect class DummyIrConstructor(symbol: IrConstructorSymbol) : IrConstructor
+expect class DummyIrConstructor(symbol: IrConstructorSymbol) : IrConstructor {
+    override var isPrimary: Boolean
+    override var isExpect: Boolean
+    override var isInline: Boolean
+    override var isExternal: Boolean
+}
diff --git a/...c/kgp_common/kotlin/co/touchlab/skie/kir/type/translation/KirDeclarationTypeTranslator.kt b/...c/kgp_common/kotlin/co/touchlab/skie/kir/type/translation/KirDeclarationTypeTranslator.kt
@@ -143,4 +143,4 @@ class KirDeclarationTypeTranslator(
         }
 }
 
-expect fun ObjCValueType.mapToOir(kotlinType: KotlinType): OirType
+internal expect fun ObjCValueType.mapToOir(kotlinType: KotlinType): OirType
-Original file line number
+Diff line change
@@ Expand Up / @@ -143,4 +143,4 @@ class KirDeclarationTypeTranslator( @@
             }
     }
-    expect fun ObjCValueType.mapToOir(kotlinType: KotlinType): OirType
+    internal expect fun ObjCValueType.mapToOir(kotlinType: KotlinType): OirType