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

Allow to interpret non const properties of compile time object

Browse Source
This commit is contained in:
Ivan Kylchik
2021-06-24 15:17:51 +03:00
committed by TeamCityServer
parent 1978bfcd85
commit 295638b26e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+3 -1
View File
@@ -374,7 +374,9 @@ class IrInterpreter(internal val environment: IrInterpreterEnvironment, internal
} }
expression.accessesTopLevelOrObjectField() -> { expression.accessesTopLevelOrObjectField() -> {
val propertyOwner = field.correspondingPropertySymbol?.owner val propertyOwner = field.correspondingPropertySymbol?.owner
val isConst = propertyOwner?.isConst == true || propertyOwner?.backingField?.initializer?.expression is IrConst<*> val isConst = propertyOwner?.isConst == true ||
propertyOwner?.backingField?.initializer?.expression is IrConst<*> ||
propertyOwner?.parentClassOrNull?.hasAnnotation(compileTimeAnnotation) == true // check if object is marked as compile time
verify(isConst) { "Cannot interpret get method on top level non const properties" } verify(isConst) { "Cannot interpret get method on top level non const properties" }
callStack.addInstruction(CompoundInstruction(field.initializer?.expression)) callStack.addInstruction(CompoundInstruction(field.initializer?.expression))
} }
compiler/testData/ir/interpreter/object.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
@CompileTimeCalculation @CompileTimeCalculation
class A { class A {
const val a = <!EVALUATED: `10`!>{ 10 }()<!> const val a = <!EVALUATED: `10`!>{ 10 }()<!> // lambda is needed to avoid computions by old frontend
companion object { companion object {
const val static = <!EVALUATED: `-10`!>{ -10 }()<!> const val static = <!EVALUATED: `-10`!>{ -10 }()<!>
@@ -16,7 +16,7 @@ object ObjectWithConst {
const val a = 100 const val a = 100
const val b = <!EVALUATED: `Value in a: 100`!>concat("Value in a: ", a)<!> const val b = <!EVALUATED: `Value in a: 100`!>concat("Value in a: ", a)<!>
val nonConst = "Not const field in compile time object" val nonConst = { "Not const field in compile time object" }()
fun concat(first: String, second: Any) = "$first$second" fun concat(first: String, second: Any) = "$first$second"
} }