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

[IR] Make IrGetObjectValue copyable to avoid duplicate IR nodes.

Browse Source 
Fixes KT-45170
This commit is contained in:
Mads Ager
2021-03-04 13:54:18 +01:00
committed by Dmitry Petrov
parent e79c9a3618
commit 7dbb0c7d20
11 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -25170,6 +25170,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/objects/kt42758.kt");
}
@Test
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@Test
@TestMetadata("kt535.kt")
public void testKt535() throws Exception {
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrDeclarationReference.kt
+1 -1
View File
@@ -27,7 +27,7 @@ abstract class IrDeclarationReference : IrExpression() {
abstract class IrGetSingletonValue : IrDeclarationReference()
abstract class IrGetObjectValue : IrGetSingletonValue() {
abstract class IrGetObjectValue : IrGetSingletonValue(), IrExpressionWithCopy {
abstract override val symbol: IrClassSymbol
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetObjectValueImpl.kt
+5
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.ir.expressions.impl
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrGetObjectValue
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.types.IrType
@@ -29,4 +30,8 @@ class IrGetObjectValueImpl(
) : IrGetObjectValue() {
override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
visitor.visitGetObjectValue(this, data)
override fun copy(): IrExpression {
return IrGetObjectValueImpl(startOffset, endOffset, type, symbol)
}
}
compiler/testData/codegen/box/objects/kt45170.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
object A {
var id = 0
get() = field.also { field++ }
}
fun box(): String {
if (A.id != 0) return "FAIL1"
if (A.id != 1) return "FAIL2"
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -25170,6 +25170,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/objects/kt42758.kt");
}
@Test
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@Test
@TestMetadata("kt535.kt")
public void testKt535() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -25170,6 +25170,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/objects/kt42758.kt");
}
@Test
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@Test
@TestMetadata("kt535.kt")
public void testKt535() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -21371,6 +21371,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/objects/kt42758.kt");
}
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@TestMetadata("kt535.kt")
public void testKt535() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt535.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -16844,6 +16844,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/objects/kt4086.kt");
}
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@TestMetadata("kt535.kt")
public void testKt535() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt535.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -16301,6 +16301,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/objects/kt4086.kt");
}
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@TestMetadata("kt535.kt")
public void testKt535() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt535.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -16366,6 +16366,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/objects/kt4086.kt");
}
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@TestMetadata("kt535.kt")
public void testKt535() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt535.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -10157,6 +10157,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/objects/kt4086.kt");
}
@TestMetadata("kt45170.kt")
public void testKt45170() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt45170.kt");
}
@TestMetadata("kt694.kt")
public void testKt694() throws Exception {
runTest("compiler/testData/codegen/box/objects/kt694.kt");