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

[FIR2IR] Correctly calculate offsets for implicit toLong() calls during constant evaluation

Browse Source 
^KT-58132 Fixed
This commit is contained in:
Dmitriy Novozhilov
2023-04-24 17:38:51 +03:00
committed by Space Team
parent 4fe239375f
commit 903e969598
17 changed files with 99 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConstValueProviderImpl.kt
+3 -2
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
import org.jetbrains.kotlin.fir.packageFqName
import org.jetbrains.kotlin.fir.serialization.constant.ConstValueProvider
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.name.Name
class ConstValueProviderImpl(
@@ -28,7 +29,7 @@ class ConstValueProviderImpl(
return if (firExpression is FirQualifiedAccessExpression) {
// TODO check that this behavior is expected in ConversionUtils and if not fix it
val calleeReference = firExpression.calleeReference
val start = calleeReference.source?.startOffsetSkippingComments() ?: calleeReference.source?.startOffset ?: return null
val start = calleeReference.source?.startOffsetSkippingComments() ?: calleeReference.source?.startOffset ?: UNDEFINED_OFFSET
val end = firExpression.source?.endOffset ?: return null
evaluatedConstTracker.load(start, end, fileName)
} else {
@@ -37,4 +38,4 @@ class ConstValueProviderImpl(
evaluatedConstTracker.load(start, end, fileName)
}
}
}
}
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8409,6 +8409,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8409,6 +8409,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
compiler/testData/codegen/box/constants/literalToLongConversion.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// ISSUE: KT-58132
const val hourInMilliseconds: Long = 60 * 60 * 1000
fun box(): String {
val expected = 3600000L
return if (hourInMilliseconds == expected) "OK" else "Fail: $hourInMilliseconds"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8193,6 +8193,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8409,6 +8409,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -8409,6 +8409,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -6259,6 +6259,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@TestMetadata("long.kt")
public void testLong() throws Exception {
runTest("compiler/testData/codegen/box/constants/long.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5411,6 +5411,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5471,6 +5471,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5471,6 +5471,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5471,6 +5471,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -6452,6 +6452,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -6598,6 +6598,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -6379,6 +6379,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -6525,6 +6525,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@Test
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@Test
@TestMetadata("long.kt")
public void testLong() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -4819,6 +4819,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/constants/kt9532.kt");
}
@TestMetadata("literalToLongConversion.kt")
public void testLiteralToLongConversion() throws Exception {
runTest("compiler/testData/codegen/box/constants/literalToLongConversion.kt");
}
@TestMetadata("long.kt")
public void testLong() throws Exception {
runTest("compiler/testData/codegen/box/constants/long.kt");