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

[MPP] Consider expect-actual inline/value classes interchangeable

Browse Source 
^KT-44926 Fixed
This commit is contained in:
Pavel Kirpichenkov
2021-02-26 18:16:28 +03:00
committed by TeamCityServer
parent c8c44da061
commit c68a4bdc0f
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectedActualResolver.kt
+1 -1
View File
@@ -424,7 +424,7 @@ object ExpectedActualResolver {
if (a.kind != b.kind) return Incompatible.ClassKind
if (!equalBy(a, b) { listOf(it.isCompanionObject, it.isInner, it.isInline) }) return Incompatible.ClassModifiers
if (!equalBy(a, b) { listOf(it.isCompanionObject, it.isInner, it.isInline || it.isValue) }) return Incompatible.ClassModifiers
val aTypeParams = a.declaredTypeParameters
val bTypeParams = b.declaredTypeParameters
compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt
Vendored
+1 -13
View File
@@ -1,13 +1 @@
compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv14.kt:9:1: error: actual typealias 'ExpectInlineActualInline' has no corresponding expected declaration
The following declaration is incompatible because modifiers are different (companion, inner, inline):
public final expect inline class ExpectInlineActualInline
actual typealias ExpectInlineActualInline = lib.InlineClass
^
compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv14.kt:10:1: error: actual typealias 'ExpectInlineActualValue' has no corresponding expected declaration
The following declaration is incompatible because modifiers are different (companion, inner, inline):
public final expect inline class ExpectInlineActualValue
actual typealias ExpectInlineActualValue = lib.ValueClass
^
COMPILATION_ERROR
OK