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

Allow dynamic types in ir fake override substitution arguments

Browse Source
This commit is contained in:
Alexander Gorshenev
2020-06-10 23:53:03 +03:00
parent 1a7b30c13a
commit 99c5585790
1 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/overrides/FakeOverrides.kt
+7 -2
View File
@@ -31,11 +31,13 @@ import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.types.IrSimpleType import org.jetbrains.kotlin.ir.types.IrSimpleType
import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.types.IrTypeProjection
import org.jetbrains.kotlin.ir.types.getClass import org.jetbrains.kotlin.ir.types.getClass
import org.jetbrains.kotlin.ir.util.SymbolTable import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.ir.visitors.acceptVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid
import org.jetbrains.kotlin.types.Variance
interface FakeOverrideBuilder { interface FakeOverrideBuilder {
fun buildFakeOverridesForClass(clazz: IrClass) fun buildFakeOverridesForClass(clazz: IrClass)
@@ -77,8 +79,11 @@ class FakeOverrideBuilderImpl(
require(classifier is IrClassSymbol) { "superType classifier is not IrClassSymbol: $classifier" } require(classifier is IrClassSymbol) { "superType classifier is not IrClassSymbol: $classifier" }
val typeParameters = classifier.owner.typeParameters.map { it.symbol } val typeParameters = classifier.owner.typeParameters.map { it.symbol }
val typeArguments = val typeArguments = superType.arguments.map {
superType.arguments.map { it as? IrSimpleType ?: error("Unexpected super type $it") } require(it is IrTypeProjection) { "Unexpected super type argument: $it" }
assert(it.variance == Variance.INVARIANT) { "Unexpected variance in super type argument: ${it.variance}" }
it.type
}
assert(typeParameters.size == typeArguments.size) { assert(typeParameters.size == typeArguments.size) {
"typeParameters = $typeParameters size != typeArguments = $typeArguments size " "typeParameters = $typeParameters size != typeArguments = $typeArguments size "