JVM_IR: move const initialization handling to lowering

Had to edit some bytecodeText tests to account for the fact that JVM_IR
no longer generates explicit initializations for ConstantValue fields,
but NoConstantValueAttributeForNonConstVals is not the default yet.
This commit is contained in:
pyos
2019-11-23 14:26:32 +01:00
committed by Alexander Udalov
parent 2ebe269448
commit fc6b03b08f
22 changed files with 61 additions and 74 deletions
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IF_ICMPNE
@@ -34,7 +33,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//2 IF_ICMPNE
//1 IF_ICMPLE
//1 IF_ICMPLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IF_ICMPEQ and GOTO
@@ -46,7 +45,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//2 IF_ICMPEQ
//1 IF_ICMPLE
//1 IF_ICMPLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IF_ICMPEQ and GOTO
@@ -34,7 +33,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//2 IF_ICMPEQ
//1 IF_ICMPLE
//1 IF_ICMPLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IFNE
@@ -34,7 +33,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//2 IFNE
//1 IFLE
//1 IFLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IFEQ and GOTO
@@ -46,7 +45,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//2 IFEQ
//1 IFLE
//1 IFLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IFEQ and GOTO
@@ -34,7 +33,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//2 IFEQ
//1 IFLE
//1 IFLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IF_ICMPEQ
@@ -29,7 +28,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//1 IF_ICMPEQ
//1 IF_ICMPLE
//1 IF_ICMPLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IF_ICMPNE and GOTO
@@ -39,7 +38,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//1 IF_ICMPNE
//1 IF_ICMPLE
//1 IF_ICMPLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IF_ICMPNE and GOTO
@@ -29,7 +28,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//1 IF_ICMPNE
//1 IF_ICMPLE
//1 IF_ICMPLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IFEQ
@@ -29,7 +28,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//1 IFEQ
//1 IFLE
//1 IFLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 0
fun main() {
// Generates IFNE and GOTO
@@ -39,7 +38,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//1 IFNE
//1 IFLE
//1 IFLT
@@ -1,5 +1,4 @@
// Generates ICONST_1
val a = 1
val a = 2
fun main() {
// Generates IFNE and GOTO
@@ -29,7 +28,7 @@ fun main() {
}
//0 ICONST_0
//1 ICONST_1
//0 ICONST_1
//1 IFNE
//1 IFLE
//1 IFLT