Clean up dx test 085.
The jasmin source had a bug which dx didn't previously catch, which is
now fixed, and I also removed a superfluous <init> method. With that
cleaned up, the test now fails but in a different way, which I believe
is indicative of a real problem, where it looks like a known constant
value is not getting properly propagated.
Change-Id: I3d31045eecc6d71cff2bca98c948dc58371d35a1
diff --git a/dx/tests/085-dex-jsr-ret/blort.j b/dx/tests/085-dex-jsr-ret/blort.j
index 2616723..e6a901c 100644
--- a/dx/tests/085-dex-jsr-ret/blort.j
+++ b/dx/tests/085-dex-jsr-ret/blort.j
@@ -15,18 +15,6 @@
.class blort
.super java/lang/Object
-.method public <init>()V
- .limit locals 2
- .limit stack 3
-
- aload_0
- dup
- dup
- astore_1
- pop2
- return
-.end method
-
; Test jsr and jsr_w.
.method public test_jsr()Ljava/lang/Object;
.limit locals 3
@@ -37,9 +25,9 @@
pop
; Call j1 with different locals
ldc 10
- astore_0
+ istore_0
jsr j1
- aload_0
+ iload_0
pop
jsr j3
areturn
diff --git a/dx/tests/085-dex-jsr-ret/expected.txt b/dx/tests/085-dex-jsr-ret/expected.txt
index ba61996..8965538 100644
--- a/dx/tests/085-dex-jsr-ret/expected.txt
+++ b/dx/tests/085-dex-jsr-ret/expected.txt
@@ -1,28 +1,5 @@
Generated: ./blort.class
reading blort.class...
-method <init> ()V
-first 0002
-block 0002
- blort.j:@0000: move-param-object(0) v0:NffffLblort; <- .
- blort.j:@0000: goto . <- .
- next 0000
-block 0000
- pred 0002
- blort.j:@0000: move-object v2:NffffLblort; <- v0:NffffLblort;
- blort.j:@0001: move-object v5:NffffLblort; <- v2:NffffLblort;
- blort.j:@0001: move-object v2:NffffLblort; <- v5:NffffLblort;
- blort.j:@0001: move-object v3:NffffLblort; <- v5:NffffLblort;
- blort.j:@0002: move-object v5:NffffLblort; <- v3:NffffLblort;
- blort.j:@0002: move-object v3:NffffLblort; <- v5:NffffLblort;
- blort.j:@0002: move-object v4:NffffLblort; <- v5:NffffLblort;
- blort.j:@0003: move-object v1:NffffLblort; <- v4:NffffLblort;
- blort.j:@0005: goto . <- .
- next 0003
-block 0003
- pred 0000
- blort.j:@0005: return-void . <- .
- returns
-
method test_jsr ()Ljava/lang/Object;
first 005c
block 005c
