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

[K/N] Disable scope initialization on constant access

Browse Source 
^KT-57098
This commit is contained in:
Pavel Kunyavskiy
2023-03-10 15:30:48 +01:00
committed by Space Team
parent e6297f92fa
commit 62fb3df7f0
18 changed files with 98 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8355,6 +8355,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8355,6 +8355,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineConstTransformer.kt
+3 -1
View File
@@ -33,7 +33,9 @@ abstract class InlineConstTransformer : IrElementTransformerVoid() {
abstract fun reportInlineConst(field: IrField, value: IrConst<*>)
abstract fun IrExpression.shouldDropConstReceiver(): Boolean
fun IrExpression.shouldDropConstReceiver(): Boolean {
return this is IrConst<*> || this is IrGetValue || this is IrGetObjectValue
}
override fun visitCall(expression: IrCall): IrExpression {
val function = (expression.symbol.owner as? IrSimpleFunction) ?: return super.visitCall(expression)
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt
-2
View File
@@ -50,6 +50,4 @@ private class JvmInlineConstTransformer(val irFile: IrFile, val inlineConstTrack
inlineConstTracker.report(path, owner, name, constType)
}
override fun IrExpression.shouldDropConstReceiver() = this is IrConst<*> || this is IrGetValue || this is IrGetObjectValue
}
compiler/testData/codegen/box/constants/doNotTriggerInit.kt
Vendored
+19
View File
@@ -0,0 +1,19 @@
// IGNORE_BACKEND: WASM
// IGNORE_BACKEND_K1: JS_IR, JS_IR_ES6
var initialized = 0
object O {
init {
initialized += 1
}
const val x = 1
val y = 2
}
fun box() : String {
if (O.x != 1) return "FAIL 1"
if (initialized != 0) return "FAIL 2"
if (O.y != 2) return "FAIL 3"
if (initialized != 1) return "FAIL 4"
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8151,6 +8151,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -8355,6 +8355,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -6224,6 +6224,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@TestMetadata("float.kt")
public void testFloat() throws Exception {
runTest("compiler/testData/codegen/box/constants/float.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5369,6 +5369,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5429,6 +5429,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5429,6 +5429,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5429,6 +5429,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/Lowerings.kt
+1 -1
View File
@@ -552,8 +552,8 @@ private fun PhaseEngine<NativeGenerationState>.getAllLowerings() = listOfNotNull
coroutinesPhase,
typeOperatorPhase,
expressionBodyTransformPhase,
objectClassesPhase,
constantInliningPhase,
objectClassesPhase,
staticInitializersPhase,
builtinOperatorPhase,
bridgesPhase,
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ConstLowering.kt
-3
View File
@@ -32,7 +32,4 @@ private class NativeInlineConstTransformer : InlineConstTransformer() {
?.takeUnless { it.kind == IrConstKind.Float && IrConstKind.Float.valueOf(it).isNaN() }
override fun reportInlineConst(field: IrField, value: IrConst<*>) {}
// on jvm IrGetObjectValue is also dropped. This would be breaking change for native.
// Some design work is required to decide what is correct, let just keep current behaviour for now
override fun IrExpression.shouldDropConstReceiver() = this is IrConst<*> || this is IrGetValue
}
kotlin-native/backend.native/tests/codegen/objectDeclaration/globalConstants.kt
+5 -1
View File
@@ -57,8 +57,12 @@ object ClassWithConstructor {
@Test fun checkConstructor() {
assertEquals(0, ClassWithConstructorInitialized)
assertEquals(1, ClassWithConstructor.A)
assertEquals(0, ClassWithConstructorInitialized)
val unused1 = ClassWithConstructor
assertEquals(1, unused1.A)
assertEquals(1, ClassWithConstructorInitialized)
assertEquals(1, ClassWithConstructor.A)
val unused2 = ClassWithConstructor
assertEquals(1, unused2.A)
assertEquals(1, ClassWithConstructorInitialized)
assertFalse(ClassWithConstructor.isPermanent())
}
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -6338,6 +6338,12 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -6265,6 +6265,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@Test
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@Test
@TestMetadata("float.kt")
public void testFloat() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -4784,6 +4784,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/constants/divisionByZero.kt");
}
@TestMetadata("doNotTriggerInit.kt")
public void testDoNotTriggerInit() throws Exception {
runTest("compiler/testData/codegen/box/constants/doNotTriggerInit.kt");
}
@TestMetadata("float.kt")
public void testFloat() throws Exception {
runTest("compiler/testData/codegen/box/constants/float.kt");