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

[IR] Reorder parameters in IrFactory#createTypeParameter

Browse Source 
This is to prepare for IrFactory auto-generation (KT-59308).
This commit is contained in:
Sergej Jaskiewicz
2023-06-14 13:04:50 +02:00
committed by Space Team
parent b1f7b5e982
commit 2b4a08524d
12 changed files with 109 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
+24 -12
View File
@@ -440,10 +440,14 @@ class Fir2IrClassifierStorage(
symbolFactory = { IrTypeParameterPublicSymbolImpl(signature) }
) { symbol ->
irFactory.createTypeParameter(
startOffset, endOffset, origin, symbol,
name, if (index < 0) 0 else index,
isReified,
variance
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
symbol = symbol,
variance = variance,
index = if (index < 0) 0 else index,
isReified = isReified,
)
}
} else {
@@ -452,19 +456,27 @@ class Fir2IrClassifierStorage(
symbolFactory = { IrTypeParameterPublicSymbolImpl(signature) }
) { symbol ->
irFactory.createTypeParameter(
startOffset, endOffset, origin, symbol,
name, if (index < 0) 0 else index,
isReified,
variance
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
symbol = symbol,
variance = variance,
index = if (index < 0) 0 else index,
isReified = isReified,
)
}
}
} ?: irFactory.createTypeParameter(
startOffset, endOffset, origin, IrTypeParameterSymbolImpl(),
name, if (index < 0) 0 else index,
isReified,
variance
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
symbol = IrTypeParameterSymbolImpl(),
variance = variance,
index = if (index < 0) 0 else index,
isReified = isReified,
)
}
}
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt
+8 -2
View File
@@ -458,8 +458,14 @@ class IrBuiltInsOverFir(
checkNotNullSymbol = run {
val typeParameter: IrTypeParameter = irFactory.createTypeParameter(
UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, IrTypeParameterSymbolImpl(), Name.identifier("T0"), 0, true,
Variance.INVARIANT
startOffset = UNDEFINED_OFFSET,
endOffset = UNDEFINED_OFFSET,
origin = BUILTIN_OPERATOR,
name = Name.identifier("T0"),
symbol = IrTypeParameterSymbolImpl(),
variance = Variance.INVARIANT,
index = 0,
isReified = true
).apply {
superTypes = listOf(anyType)
}