Skip to content

Commit c03e87d

Browse files
flofridaySpace Team
flofriday
authored and
Space Team
committed
[FIR] Remove temporary hack from interpreter tests
KT-51065
1 parent f600ee3 commit c03e87d

File tree

11 files changed

+58
-63
lines changed

11 files changed

+58
-63
lines changed

‎compiler/fir/providers/src/org/jetbrains/kotlin/fir/expressions/FirExpressionEvaluator.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ object FirExpressionEvaluator {
100100
}
101101

102102
private fun FirExpression?.canBeEvaluated(session: FirSession): Boolean {
103-
val intrinsicConstEvaluation = session.languageVersionSettings.supportsFeature(LanguageFeature.IntrinsicConstEvaluation)
104-
if (this == null || intrinsicConstEvaluation || this is FirLazyExpression || !isResolved) return false
103+
if (this == null || this is FirLazyExpression || !isResolved) return false
105104
return canBeEvaluatedAtCompileTime(this, session, allowErrors = false, calledOnCheckerStage = false)
106105
}
107106

‎compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/accessComplexConst.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public class Bar {
1212
// FILE: Main.kt
1313
package one.two
1414

15-
const val FOO = "123".<!EVALUATED("123")!>trimIndent()<!>
15+
// TODO, KT-22505: Reenable .trimIndent once implemented.
16+
const val FOO = <!EVALUATED("123")!>"123"<!>
1617

1718
const val BAZ = <!EVALUATED("123 JavaString KotlinString")!>Bar.BAR + " KotlinString"<!>
1819

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/constTrimIndent.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// WITH_STDLIB
44
fun <T> T.id() = this
55

6-
const val trimIndent = "123".<!EVALUATED("123")!>trimIndent()<!>
6+
const val trimIndent = "123".<!EVALUATED{IR}("123")!>trimIndent()<!>
77
const val complexTrimIndent =
88
"""
99
ABC
1010
123
1111
456
12-
""".<!EVALUATED("ABC\n123\n456")!>trimIndent()<!>
12+
""".<!EVALUATED{IR}("ABC\n123\n456")!>trimIndent()<!>
1313

1414
// STOP_EVALUATION_CHECKS
1515
fun box(): String {

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/constTrimMargin.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// WITH_STDLIB
44
fun <T> T.id() = this
55

6-
const val trimMargin = "123".<!EVALUATED("123")!>trimMargin()<!>
6+
const val trimMargin = "123".<!EVALUATED{IR}("123")!>trimMargin()<!>
77

88
const val trimMarginDefault = """ABC
99
|123
10-
|456""".<!EVALUATED("ABC\n123\n456")!>trimMargin()<!>
10+
|456""".<!EVALUATED{IR}("ABC\n123\n456")!>trimMargin()<!>
1111

1212
const val withoutMargin = """
1313
#XYZ
1414
#foo
1515
#bar
16-
""".<!EVALUATED("XYZ\nfoo\nbar")!>trimMargin("#")<!>
16+
""".<!EVALUATED{IR}("XYZ\nfoo\nbar")!>trimMargin("#")<!>
1717

1818
// STOP_EVALUATION_CHECKS
1919
fun box(): String {

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/enumName.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ enum class EnumClass {
66
OK, VALUE, anotherValue, WITH_UNDERSCORE
77
}
88

9-
const val name1 = EnumClass.OK.<!EVALUATED("OK")!>name<!>
10-
const val name2 = EnumClass.VALUE.<!EVALUATED("VALUE")!>name<!>
11-
const val name3 = EnumClass.anotherValue.<!EVALUATED("anotherValue")!>name<!>
12-
const val name4 = EnumClass.WITH_UNDERSCORE.<!EVALUATED("WITH_UNDERSCORE")!>name<!>
9+
const val name1 = EnumClass.OK.<!EVALUATED{IR}("OK")!>name<!>
10+
const val name2 = EnumClass.VALUE.<!EVALUATED{IR}("VALUE")!>name<!>
11+
const val name3 = EnumClass.anotherValue.<!EVALUATED{IR}("anotherValue")!>name<!>
12+
const val name4 = EnumClass.WITH_UNDERSCORE.<!EVALUATED{IR}("WITH_UNDERSCORE")!>name<!>
1313

1414
// STOP_EVALUATION_CHECKS
1515
fun box(): String {

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/equals_after.kt‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,44 +49,44 @@ const val doubleFourVal = <!EVALUATED("4.0")!>4.0<!>
4949
const val someStr = <!EVALUATED("123")!>"123"<!>
5050
const val otherStr = <!EVALUATED("other")!>"other"<!>
5151

52-
const val equalsBoolean1 = trueVal.<!EVALUATED("true")!>equals(trueVal)<!>
52+
const val equalsBoolean1 = trueVal.<!EVALUATED{IR}("true")!>equals(trueVal)<!>
5353
const val equalsBoolean2 = <!EVALUATED("false")!>trueVal == falseVal<!>
54-
const val equalsBoolean3 = falseVal.<!EVALUATED("false")!>equals(1)<!>
54+
const val equalsBoolean3 = falseVal.<!EVALUATED{IR}("false")!>equals(1)<!>
5555

56-
const val equalsChar1 = charOneVal.<!EVALUATED("false")!>equals(charTwoVal)<!>
57-
const val equalsChar2 = charTwoVal.<!EVALUATED("true")!>equals(charTwoVal)<!>
56+
const val equalsChar1 = charOneVal.<!EVALUATED{IR}("false")!>equals(charTwoVal)<!>
57+
const val equalsChar2 = charTwoVal.<!EVALUATED{IR}("true")!>equals(charTwoVal)<!>
5858
const val equalsChar3 = <!EVALUATED("false")!>charThreeVal == charTwoVal<!>
59-
const val equalsChar4 = charFourVal.<!EVALUATED("false")!>equals(1)<!>
59+
const val equalsChar4 = charFourVal.<!EVALUATED{IR}("false")!>equals(1)<!>
6060

61-
const val equalsByte1 = byteOneVal.<!EVALUATED("false")!>equals(byteTwoVal)<!>
62-
const val equalsByte2 = byteTwoVal.<!EVALUATED("true")!>equals(byteTwoVal)<!>
61+
const val equalsByte1 = byteOneVal.<!EVALUATED{IR}("false")!>equals(byteTwoVal)<!>
62+
const val equalsByte2 = byteTwoVal.<!EVALUATED{IR}("true")!>equals(byteTwoVal)<!>
6363
const val equalsByte3 = <!EVALUATED("false")!>byteThreeVal == byteTwoVal<!>
64-
const val equalsByte4 = byteFourVal.<!EVALUATED("false")!>equals(1)<!>
64+
const val equalsByte4 = byteFourVal.<!EVALUATED{IR}("false")!>equals(1)<!>
6565

66-
const val equalsShort1 = shortOneVal.<!EVALUATED("false")!>equals(shortTwoVal)<!>
67-
const val equalsShort2 = shortTwoVal.<!EVALUATED("true")!>equals(shortTwoVal)<!>
66+
const val equalsShort1 = shortOneVal.<!EVALUATED{IR}("false")!>equals(shortTwoVal)<!>
67+
const val equalsShort2 = shortTwoVal.<!EVALUATED{IR}("true")!>equals(shortTwoVal)<!>
6868
const val equalsShort3 = <!EVALUATED("false")!>shortThreeVal == shortTwoVal<!>
69-
const val equalsShort4 = shortFourVal.<!EVALUATED("false")!>equals(1)<!>
69+
const val equalsShort4 = shortFourVal.<!EVALUATED{IR}("false")!>equals(1)<!>
7070

71-
const val equalsInt1 = intOneVal.<!EVALUATED("false")!>equals(intTwoVal)<!>
72-
const val equalsInt2 = intTwoVal.<!EVALUATED("true")!>equals(intTwoVal)<!>
71+
const val equalsInt1 = intOneVal.<!EVALUATED{IR}("false")!>equals(intTwoVal)<!>
72+
const val equalsInt2 = intTwoVal.<!EVALUATED{IR}("true")!>equals(intTwoVal)<!>
7373
const val equalsInt3 = <!EVALUATED("false")!>intThreeVal == intTwoVal<!>
74-
const val equalsInt4 = intFourVal.<!EVALUATED("false")!>equals(1)<!>
74+
const val equalsInt4 = intFourVal.<!EVALUATED{IR}("false")!>equals(1)<!>
7575

76-
const val equalsLong1 = longOneVal.<!EVALUATED("false")!>equals(longTwoVal)<!>
77-
const val equalsLong2 = longTwoVal.<!EVALUATED("true")!>equals(longTwoVal)<!>
76+
const val equalsLong1 = longOneVal.<!EVALUATED{IR}("false")!>equals(longTwoVal)<!>
77+
const val equalsLong2 = longTwoVal.<!EVALUATED{IR}("true")!>equals(longTwoVal)<!>
7878
const val equalsLong3 = <!EVALUATED("false")!>longThreeVal == longTwoVal<!>
79-
const val equalsLong4 = longFourVal.<!EVALUATED("false")!>equals(1)<!>
79+
const val equalsLong4 = longFourVal.<!EVALUATED{IR}("false")!>equals(1)<!>
8080

81-
const val equalsFloat1 = floatOneVal.<!EVALUATED("false")!>equals(floatTwoVal)<!>
82-
const val equalsFloat2 = floatTwoVal.<!EVALUATED("true")!>equals(floatTwoVal)<!>
81+
const val equalsFloat1 = floatOneVal.<!EVALUATED{IR}("false")!>equals(floatTwoVal)<!>
82+
const val equalsFloat2 = floatTwoVal.<!EVALUATED{IR}("true")!>equals(floatTwoVal)<!>
8383
const val equalsFloat3 = <!EVALUATED("false")!>floatThreeVal == floatTwoVal<!>
84-
const val equalsFloat4 = floatFourVal.<!EVALUATED("false")!>equals(1)<!>
84+
const val equalsFloat4 = floatFourVal.<!EVALUATED{IR}("false")!>equals(1)<!>
8585

86-
const val equalsDouble1 = doubleOneVal.<!EVALUATED("false")!>equals(doubleTwoVal)<!>
87-
const val equalsDouble2 = doubleTwoVal.<!EVALUATED("true")!>equals(doubleTwoVal)<!>
86+
const val equalsDouble1 = doubleOneVal.<!EVALUATED{IR}("false")!>equals(doubleTwoVal)<!>
87+
const val equalsDouble2 = doubleTwoVal.<!EVALUATED{IR}("true")!>equals(doubleTwoVal)<!>
8888
const val equalsDouble3 = <!EVALUATED("false")!>doubleThreeVal == doubleTwoVal<!>
89-
const val equalsDouble4 = doubleFourVal.<!EVALUATED("false")!>equals(1)<!>
89+
const val equalsDouble4 = doubleFourVal.<!EVALUATED{IR}("false")!>equals(1)<!>
9090

9191
const val equalsString1 = someStr.<!EVALUATED("false")!>equals(otherStr)<!>
9292
const val equalsString2 = someStr.<!EVALUATED("true")!>equals("123")<!>

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/kCallableName.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ class A(val OK: Int, val somePropertyWithLongName: String) {
99
}
1010
val topLevelProp = 1
1111

12-
const val propertyName1 = A::OK.<!EVALUATED("OK")!>name<!>
13-
const val propertyName2 = A::somePropertyWithLongName.<!EVALUATED("somePropertyWithLongName")!>name<!>
14-
const val methodName = A::foo.<!EVALUATED("foo")!>name<!>
15-
const val suspendMethodName = A::bar.<!EVALUATED("bar")!>name<!>
16-
const val className = ::A.<!EVALUATED("<init>")!>name<!>
17-
const val topLevelPropName = ::topLevelProp.<!EVALUATED("topLevelProp")!>name<!>
18-
const val nameInComplexExpression = <!EVALUATED("OK!")!>A::OK.name + "!"<!>
12+
const val propertyName1 = A::OK.<!EVALUATED{IR}("OK")!>name<!>
13+
const val propertyName2 = A::somePropertyWithLongName.<!EVALUATED{IR}("somePropertyWithLongName")!>name<!>
14+
const val methodName = A::foo.<!EVALUATED{IR}("foo")!>name<!>
15+
const val suspendMethodName = A::bar.<!EVALUATED{IR}("bar")!>name<!>
16+
const val className = ::A.<!EVALUATED{IR}("<init>")!>name<!>
17+
const val topLevelPropName = ::topLevelProp.<!EVALUATED{IR}("topLevelProp")!>name<!>
18+
const val nameInComplexExpression = <!EVALUATED{IR}("OK!")!>A::OK.name + "!"<!>
1919

2020
// STOP_EVALUATION_CHECKS
2121
fun box(): String {

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/kCallableNameWithSideEffect.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ class A {
1717
}
1818

1919
fun test() {
20-
val a = A::a.<!EVALUATED("a")!>name<!>
21-
val b = A::b.<!EVALUATED("b")!>name<!>
20+
val a = A::a.<!EVALUATED{IR}("a")!>name<!>
21+
val b = A::b.<!EVALUATED{IR}("b")!>name<!>
2222

23-
val c = ::A.<!EVALUATED("<init>")!>name<!>
24-
val d = this::a.<!EVALUATED("a")!>name<!>
23+
val c = ::A.<!EVALUATED{IR}("<init>")!>name<!>
24+
val d = this::a.<!EVALUATED{IR}("a")!>name<!>
2525

26-
val e = A()::b.<!EVALUATED("b")!>name<!>
27-
val f = getA()::b.<!EVALUATED("b")!>name<!>
26+
val e = A()::b.<!EVALUATED{IR}("b")!>name<!>
27+
val f = getA()::b.<!EVALUATED{IR}("b")!>name<!>
2828

2929
val temp = A()
30-
val g = temp::b.<!EVALUATED("b")!>name<!>
31-
val insideStringConcat = "${temp::b.<!EVALUATED("b")!>name<!>}"
30+
val g = temp::b.<!EVALUATED{IR}("b")!>name<!>
31+
val insideStringConcat = "${temp::b.<!EVALUATED{IR}("b")!>name<!>}"
3232

33-
val complexExpression1 = A()::a.<!EVALUATED("a")!>name<!> + A()::b.<!EVALUATED("b")!>name<!>
34-
val complexExpression2 = <!EVALUATED("ab")!>A::a.name + A::b.name<!>
33+
val complexExpression1 = A()::a.<!EVALUATED{IR}("a")!>name<!> + A()::b.<!EVALUATED{IR}("b")!>name<!>
34+
val complexExpression2 = <!EVALUATED{IR}("ab")!>A::a.name + A::b.name<!>
3535

36-
val recursive = ::test.<!EVALUATED("test")!>name<!>
36+
val recursive = ::test.<!EVALUATED{IR}("test")!>name<!>
3737

38-
val wihtParams1 = A::withParameters.<!EVALUATED("withParameters")!>name<!>
39-
val wihtParams2 = A()::withParameters.<!EVALUATED("withParameters")!>name<!>
38+
val wihtParams1 = A::withParameters.<!EVALUATED{IR}("withParameters")!>name<!>
39+
val wihtParams2 = A()::withParameters.<!EVALUATED{IR}("withParameters")!>name<!>
4040
}
4141

4242
fun getA(): A = A()

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/kt53272.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// FILE: 1.kt
55

6-
const val name = E.OK.<!EVALUATED("OK")!>name<!>
6+
const val name = E.OK.<!EVALUATED{IR}("OK")!>name<!>
77
// STOP_EVALUATION_CHECKS
88
fun box(): String = name
99

‎compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst/kt58717.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ object O {
1313
}
1414

1515
fun box(): String {
16-
O::foo.<!EVALUATED("foo")!>name<!>
16+
O::foo.<!EVALUATED{IR}("foo")!>name<!>
1717
return result
1818
}

0 commit comments

Comments
 (0)