Skip to content

Commit 9668d75

Browse files
francescoo22liamoberg
authored andcommitted
[IR] Make startOffset and endOffset mutable
^KT-75196
1 parent 4e2914a commit 9668d75

File tree

87 files changed

+204
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+204
-208
lines changed

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/AbstractFir2IrLazyFunction.kt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,18 @@ import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
2222
import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
2323
import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
2424
import org.jetbrains.kotlin.ir.util.isFacadeClass
25-
import org.jetbrains.kotlin.ir.util.isObject
26-
import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled
2725
import kotlin.properties.ReadWriteProperty
2826

2927
abstract class AbstractFir2IrLazyFunction<F : FirCallableDeclaration>(
3028
protected val c: Fir2IrComponents,
31-
startOffset: Int,
32-
endOffset: Int,
29+
override var startOffset: Int,
30+
override var endOffset: Int,
3331
override var origin: IrDeclarationOrigin,
3432
override val symbol: IrSimpleFunctionSymbol,
3533
parent: IrDeclarationParent,
3634
override var isFakeOverride: Boolean,
3735
) : AbstractIrLazyFunction(), AbstractFir2IrLazyDeclaration<F>, Fir2IrTypeParametersContainer, IrLazyFunctionBase,
3836
Fir2IrComponents by c {
39-
40-
final override var startOffset: Int = startOffset
41-
set(_) = shouldNotBeCalled()
42-
final override var endOffset: Int = endOffset
43-
set(_) = shouldNotBeCalled()
44-
4537
init {
4638
this.parent = parent
4739
}

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import org.jetbrains.kotlin.name.Name
4141

4242
class Fir2IrLazyClass(
4343
private val c: Fir2IrComponents,
44-
override val startOffset: Int,
45-
override val endOffset: Int,
44+
override var startOffset: Int,
45+
override var endOffset: Int,
4646
override var origin: IrDeclarationOrigin,
4747
override val fir: FirRegularClass,
4848
override val symbol: IrClassSymbol,

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ
2828

2929
class Fir2IrLazyConstructor(
3030
private val c: Fir2IrComponents,
31-
override val startOffset: Int,
32-
override val endOffset: Int,
31+
override var startOffset: Int,
32+
override var endOffset: Int,
3333
override var origin: IrDeclarationOrigin,
3434
override val fir: FirConstructor,
3535
override val symbol: IrConstructorSymbol,

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyField.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import org.jetbrains.kotlin.name.Name
3838

3939
class Fir2IrLazyField(
4040
private val c: Fir2IrComponents,
41-
override val startOffset: Int,
42-
override val endOffset: Int,
41+
override var startOffset: Int,
42+
override var endOffset: Int,
4343
override var origin: IrDeclarationOrigin,
4444
override val fir: FirField,
4545
val containingClass: FirRegularClass?,

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ import org.jetbrains.kotlin.ir.util.isFacadeClass
3939
import org.jetbrains.kotlin.name.Name
4040
import org.jetbrains.kotlin.name.NameUtils
4141
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
42-
import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled
4342

4443
class Fir2IrLazyProperty(
4544
private val c: Fir2IrComponents,
46-
startOffset: Int,
47-
endOffset: Int,
45+
override var startOffset: Int,
46+
override var endOffset: Int,
4847
override var origin: IrDeclarationOrigin,
4948
override val fir: FirProperty,
5049
val containingClass: FirRegularClass?,
@@ -54,11 +53,6 @@ class Fir2IrLazyProperty(
5453
) : IrProperty(), AbstractFir2IrLazyDeclaration<FirProperty>, Fir2IrComponents by c {
5554
override val symbol: IrPropertySymbol = symbols.propertySymbol
5655

57-
override var startOffset: Int = startOffset
58-
set(_) = shouldNotBeCalled()
59-
override var endOffset: Int = endOffset
60-
set(_) = shouldNotBeCalled()
61-
6256
init {
6357
this.parent = parent
6458
symbol.bind(this)

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyTypeAlias.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.name.Name
2727

2828
class Fir2IrLazyTypeAlias(
2929
c: Fir2IrComponents,
30-
override val startOffset: Int,
31-
override val endOffset: Int,
30+
override var startOffset: Int,
31+
override var endOffset: Int,
3232
override var origin: IrDeclarationOrigin,
3333
override val fir: FirTypeAlias,
3434
override val symbol: IrTypeAliasSymbol,

compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/IrElement.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ interface IrElement {
2525
*
2626
* @see IrFileEntry.getSourceRangeInfo
2727
*/
28-
val startOffset: Int
28+
var startOffset: Int
2929

3030
/**
3131
* The end offset of the syntax node from which this IR node was generated,
@@ -35,7 +35,7 @@ interface IrElement {
3535
*
3636
* @see IrFileEntry.getSourceRangeInfo
3737
*/
38-
val endOffset: Int
38+
var endOffset: Int
3939

4040
/**
4141
* Original element before copying. Always satisfies the following

compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/declarations/IrOverridableDeclaration.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ import org.jetbrains.kotlin.ir.symbols.IrSymbol
1414
* Generated from: [org.jetbrains.kotlin.ir.generator.IrTree.overridableDeclaration]
1515
*/
1616
sealed interface IrOverridableDeclaration<S : IrSymbol> : IrOverridableMember {
17-
override var startOffset: Int
18-
19-
override var endOffset: Int
20-
2117
override val symbol: S
2218

2319
var isFakeOverride: Boolean

compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/declarations/impl/IrAnonymousInitializerImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
2222
import org.jetbrains.kotlin.ir.symbols.IrAnonymousInitializerSymbol
2323

2424
class IrAnonymousInitializerImpl @IrImplementationDetail constructor(
25-
override val startOffset: Int,
26-
override val endOffset: Int,
25+
override var startOffset: Int,
26+
override var endOffset: Int,
2727
override var origin: IrDeclarationOrigin,
2828
override val factory: IrFactory,
2929
override val symbol: IrAnonymousInitializerSymbol,

compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import org.jetbrains.kotlin.ir.types.IrType
2323
import org.jetbrains.kotlin.name.Name
2424

2525
class IrClassImpl @IrImplementationDetail constructor(
26-
override val startOffset: Int,
27-
override val endOffset: Int,
26+
override var startOffset: Int,
27+
override var endOffset: Int,
2828
override var origin: IrDeclarationOrigin,
2929
override val factory: IrFactory,
3030
override var name: Name,

0 commit comments

Comments
 (0)