summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dx/tests/069-dex-source-position/expected.txt142
-rw-r--r--dx/tests/091-ssa-const-collector/expected.txt53
-rw-r--r--dx/tests/093-ssa-invoke-range/expected.txt5
3 files changed, 89 insertions, 111 deletions
diff --git a/dx/tests/069-dex-source-position/expected.txt b/dx/tests/069-dex-source-position/expected.txt
index 853ee6581..cd45497c8 100644
--- a/dx/tests/069-dex-source-position/expected.txt
+++ b/dx/tests/069-dex-source-position/expected.txt
@@ -8,30 +8,30 @@ regs: 0006; ins: 0001; outs: 0001
0006: return v0
0007: move v2, v0
0008: const/4 v3, #int 1 // #1
- 0009: sub-int/2addr v2, v3
- 000a: invoke-static {v2}, Blort.test:(I)I
- 000d: move-result v2
- 000e: move v0, v2
- 000f: move v2, v0
- 0010: move v3, v0
- 0011: const/4 v4, #int 2 // #2
- 0012: sub-int/2addr v3, v4
- 0013: invoke-static {v3}, Blort.test:(I)I
- 0016: move-result v3
- 0017: add-int/2addr v2, v3
- 0018: move v0, v2
- 0019: move v2, v0
+ 0009: add-int/lit8 v2, v2, #int -1 // #ff
+ 000b: invoke-static {v2}, Blort.test:(I)I
+ 000e: move-result v2
+ 000f: move v0, v2
+ 0010: move v2, v0
+ 0011: move v3, v0
+ 0012: const/4 v4, #int 2 // #2
+ 0013: add-int/lit8 v3, v3, #int -2 // #fe
+ 0015: invoke-static {v3}, Blort.test:(I)I
+ 0018: move-result v3
+ 0019: add-int/2addr v2, v3
001a: move v0, v2
- 001b: goto 0006 // -0015
- 001c: move-exception v2
- 001d: move-object v1, v2
- 001e: const/4 v2, #int 2 // #2
- 001f: move v0, v2
- 0020: goto 0006 // -001a
+ 001b: move v2, v0
+ 001c: move v0, v2
+ 001d: goto 0006 // -0017
+ 001e: move-exception v2
+ 001f: move-object v1, v2
+ 0020: const/4 v2, #int 2 // #2
+ 0021: move v0, v2
+ 0022: goto 0006 // -001c
catches
tries:
- try 000a..000d
- catch java.lang.RuntimeException -> 001c
+ try 000b..000e
+ catch java.lang.RuntimeException -> 001e
Blort.test:(I)I:
regs: 0006; ins: 0001; outs: 0001
0000: move v0, v5
@@ -42,30 +42,30 @@ regs: 0006; ins: 0001; outs: 0001
0006: return v0
0007: move v2, v0
0008: const/4 v3, #int 1 // #1
- 0009: sub-int/2addr v2, v3
- 000a: invoke-static {v2}, Blort.test:(I)I
- 000d: move-result v2
- 000e: move v0, v2
- 000f: move v2, v0
- 0010: move v3, v0
- 0011: const/4 v4, #int 2 // #2
- 0012: sub-int/2addr v3, v4
- 0013: invoke-static {v3}, Blort.test:(I)I
- 0016: move-result v3
- 0017: add-int/2addr v2, v3
- 0018: move v0, v2
- 0019: move v2, v0
+ 0009: add-int/lit8 v2, v2, #int -1 // #ff
+ 000b: invoke-static {v2}, Blort.test:(I)I
+ 000e: move-result v2
+ 000f: move v0, v2
+ 0010: move v2, v0
+ 0011: move v3, v0
+ 0012: const/4 v4, #int 2 // #2
+ 0013: add-int/lit8 v3, v3, #int -2 // #fe
+ 0015: invoke-static {v3}, Blort.test:(I)I
+ 0018: move-result v3
+ 0019: add-int/2addr v2, v3
001a: move v0, v2
- 001b: goto 0006 // -0015
- 001c: move-exception v2
- 001d: move-object v1, v2
- 001e: const/4 v2, #int 2 // #2
- 001f: move v0, v2
- 0020: goto 0006 // -001a
+ 001b: move v2, v0
+ 001c: move v0, v2
+ 001d: goto 0006 // -0017
+ 001e: move-exception v2
+ 001f: move-object v1, v2
+ 0020: const/4 v2, #int 2 // #2
+ 0021: move v0, v2
+ 0022: goto 0006 // -001c
catches
tries:
- try 000a..000d
- catch java.lang.RuntimeException -> 001c
+ try 000b..000e
+ catch java.lang.RuntimeException -> 001e
debug info
line_start: 20
parameters_size: 0001
@@ -76,10 +76,10 @@ regs: 0006; ins: 0001; outs: 0001
0006: line 29
line = 24
0007: line 24
- 000f: line 28
- 0019: line 29
- 001c: line 25
- 001e: line 26
+ 0010: line 28
+ 001b: line 29
+ 001e: line 25
+ 0020: line 26
end sequence
source file: "Blort.java"
Blort.test:(I)I:
@@ -92,30 +92,30 @@ regs: 0006; ins: 0001; outs: 0001
0006: return v0
0007: move v2, v0
0008: const/4 v3, #int 1 // #1
- 0009: sub-int/2addr v2, v3
- 000a: invoke-static {v2}, Blort.test:(I)I
- 000d: move-result v2
- 000e: move v0, v2
- 000f: move v2, v0
- 0010: move v3, v0
- 0011: const/4 v4, #int 2 // #2
- 0012: sub-int/2addr v3, v4
- 0013: invoke-static {v3}, Blort.test:(I)I
- 0016: move-result v3
- 0017: add-int/2addr v2, v3
- 0018: move v0, v2
- 0019: move v2, v0
+ 0009: add-int/lit8 v2, v2, #int -1 // #ff
+ 000b: invoke-static {v2}, Blort.test:(I)I
+ 000e: move-result v2
+ 000f: move v0, v2
+ 0010: move v2, v0
+ 0011: move v3, v0
+ 0012: const/4 v4, #int 2 // #2
+ 0013: add-int/lit8 v3, v3, #int -2 // #fe
+ 0015: invoke-static {v3}, Blort.test:(I)I
+ 0018: move-result v3
+ 0019: add-int/2addr v2, v3
001a: move v0, v2
- 001b: goto 0006 // -0015
- 001c: move-exception v2
- 001d: move-object v1, v2
- 001e: const/4 v2, #int 2 // #2
- 001f: move v0, v2
- 0020: goto 0006 // -001a
+ 001b: move v2, v0
+ 001c: move v0, v2
+ 001d: goto 0006 // -0017
+ 001e: move-exception v2
+ 001f: move-object v1, v2
+ 0020: const/4 v2, #int 2 // #2
+ 0021: move v0, v2
+ 0022: goto 0006 // -001c
catches
tries:
- try 000a..000d
- catch java.lang.RuntimeException -> 001c
+ try 000b..000e
+ catch java.lang.RuntimeException -> 001e
debug info
line_start: 20
parameters_size: 0001
@@ -126,9 +126,9 @@ regs: 0006; ins: 0001; outs: 0001
0006: line 29
line = 24
0007: line 24
- 000f: line 28
- 0019: line 29
- 001c: line 25
- 001e: line 26
+ 0010: line 28
+ 001b: line 29
+ 001e: line 25
+ 0020: line 26
end sequence
source file: "Blort.java"
diff --git a/dx/tests/091-ssa-const-collector/expected.txt b/dx/tests/091-ssa-const-collector/expected.txt
index 3427cba3b..a8139f17d 100644
--- a/dx/tests/091-ssa-const-collector/expected.txt
+++ b/dx/tests/091-ssa-const-collector/expected.txt
@@ -98,7 +98,7 @@ block 000b
pred 006c
Blort.java:24@000b: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v1:Lj
ava/lang/String;="foo"
next 000e
block 000e
@@ -109,7 +109,7 @@ block 0012
pred 006e
Blort.java:25@0012: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v1:Lj
ava/lang/String;="foo"
next 0015
block 0015
@@ -120,7 +120,7 @@ block 0019
pred 0070
Blort.java:26@0019: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v1:Lj
ava/lang/String;="foo"
next 001c
block 001c
@@ -131,7 +131,7 @@ block 0020
pred 0072
Blort.java:27@0020: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v1:Lj
ava/lang/String;="foo"
next 0023
block 0023
@@ -142,7 +142,7 @@ block 0027
pred 0074
Blort.java:28@0027: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v1:Lj
ava/lang/String;="foo"
next 002a
block 002a
@@ -153,12 +153,12 @@ block 002e
pred 0076
Blort.java:29@002e: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v1:Lj
ava/lang/String;="foo"
next 0065
block 0064
- pred 007b
- Blort.java:22@0000: move-param-object(0) v3:"this"LBlort; <- .
+ pred 0078
+ Blort.java:22@0000: move-param-object(0) v2:"this"LBlort; <- .
Blort.java:22@0000: goto . <- .
next 0000
block 0065
@@ -209,16 +209,6 @@ block 0076
next 002e
block 0078
@????: goto . <- .
- next 007a
-block 007a
- pred 0078
- @????: const-object("foo" catch) . <- .
- next 007b
-block 007b
- pred 007a
- @????: Rop{move-result-pseudo Ljava/lang/String; <- . flows} v2:Ljava/lang/St
- ring;="foo" <- .
- @????: goto . <- .
next 0064
method testCaughtStrings ()V
@@ -242,7 +232,7 @@ block 000b
pred 0086
Blort.java:35@000b: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v4:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
ava/lang/String;="foo"
next 000e
block 000e
@@ -253,7 +243,7 @@ block 0012
pred 0088
Blort.java:36@0012: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v4:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
ava/lang/String;="foo"
next 0015
block 0015
@@ -264,7 +254,7 @@ block 0019
pred 008a
Blort.java:37@0019: Rop{invoke-virtual . <- Ljava/lang/StringBuilder; Ljava/l
ang/String; call throws <any>}(java.lang.StringBuilder.append:(Ljava/lang/Str
- ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v4:Lj
+ ing;)Ljava/lang/StringBuilder; catch) . <- v0:Ljava/lang/StringBuilder; v2:Lj
ava/lang/String;="foo"
next 001d
block 001d
@@ -320,11 +310,11 @@ block 003b
pred 0093
Blort.java:43@003b: Rop{invoke-virtual . <- Ljava/io/PrintStream; Ljava/lang/
String; call throws <any>}(java.io.PrintStream.println:(Ljava/lang/String;)V
- catch) . <- v2:Ljava/io/PrintStream; v4:Ljava/lang/String;="foo"
+ catch) . <- v2:Ljava/io/PrintStream; v3:Ljava/lang/String;="foo"
next 007f
block 007e
- pred 009e
- Blort.java:33@0000: move-param-object(0) v5:"this"LBlort; <- .
+ pred 0094
+ Blort.java:33@0000: move-param-object(0) v4:"this"LBlort; <- .
Blort.java:33@0000: goto . <- .
next 0000
block 007f
@@ -388,7 +378,7 @@ block 0093
next 003b
block 0094
@????: goto . <- .
- next 009d
+ next 007e
block 0095
pred 001d
pred 0020
@@ -396,21 +386,10 @@ block 0095
pred 0027
pred 002a
pred 002e
- Blort.java:42@0035: Rop{move-exception Ljava/lang/Throwable; <- . flows} v2:L
+ Blort.java:42@0035: Rop{move-exception Ljava/lang/Throwable; <- . flows} v1:L
java/lang/Throwable; <- .
- @????: move-object v1:Ljava/lang/Throwable; <- v2:Ljava/lang/Throwable;
@????: goto . <- .
next 0035
-block 009d
- pred 0094
- @????: const-object("foo" catch) . <- .
- next 009e
-block 009e
- pred 009d
- @????: Rop{move-result-pseudo Ljava/lang/String; <- . flows} v4:Ljava/lang/St
- ring;="foo" <- .
- @????: goto . <- .
- next 007e
method testLocalVars ()V
first 0004
diff --git a/dx/tests/093-ssa-invoke-range/expected.txt b/dx/tests/093-ssa-invoke-range/expected.txt
index 5d9adb8f1..0506c4deb 100644
--- a/dx/tests/093-ssa-invoke-range/expected.txt
+++ b/dx/tests/093-ssa-invoke-range/expected.txt
@@ -265,7 +265,7 @@ block 0004
next 0017
block 0017
pred 0004
- Blort.java:63@0018: conv-i2l v4:J <- v3:I
+ Blort.java:63@0018: conv-i2l v6:J <- v3:I
Blort.java:63@0019: goto . <- .
next 003d
block 001a
@@ -276,7 +276,6 @@ block 001a
block 001d
pred 0043
@????: mark-local-long . <- v6:"offset"J
- @????: move-long v4:J <- v6:"offset"J
Blort.java:66@001f: goto . <- .
next 003d
block 003c
@@ -288,7 +287,7 @@ block 003c
block 003d
pred 0017
pred 001d
- Blort.java:66@001f: return-long . <- v4:J
+ Blort.java:66@001f: return-long . <- v6:J
returns
block 0043
pred 001a
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-31 10:34:21 +0000