Update test expectations for 911-get-stack-trace
With D8 version 1.3.1-dev the optimization "Eliminate redundant field loads."
(https://r8-review.googlesource.com/c/r8/+/22160) removes an instruction in
one of the methods in the test 911-get-stack-trace.
The code
3: 0x06: InvokeStatic { v0 v3 v4 } Lart/PrintThread;->print(Ljava/lang/Thread;II)V
4: 0x09: Goto 0x32 (+41)
0x0a, line 43, locals: [3 -> start, 4 -> max, 5 -> data]
5: 0x0a: IgetObject v0, v5, Field java.lang.Object art.ControlData.waitFor
6: 0x0c: IfEqz v0, 0x28 (+28)
0x0e, line 44, locals: [3 -> start, 4 -> max, 5 -> data]
7: 0x0e: IgetObject v0, v5, Field java.lang.Object art.ControlData.waitFor
8: 0x10: MonitorEnter v0
0x11, line 45, locals: [3 -> start, 4 -> max, 5 -> data]
9: 0x11: IgetObject v1, v5, Field java.util.concurrent.CountDownLatch art.ControlData.reached
10: 0x13: InvokeVirtual { v1 } Ljava/util/concurrent/CountDownLatch;->countDown()V
0x16, line 47, locals: [3 -> start, 4 -> max, 5 -> data]
11: 0x16: IgetObject v1, v5, Field java.lang.Object art.ControlData.waitFor
12: 0x18: InvokeVirtual { v1 } Ljava/lang/Object;->wait()V
becomes
3: 0x06: InvokeStatic { v0 v3 v4 } Lart/PrintThread;->print(Ljava/lang/Thread;II)V
4: 0x09: Goto 0x30 (+39)
0x0a, line 43, locals: [3 -> start, 4 -> max, 5 -> data]
5: 0x0a: IgetObject v0, v5, Field java.lang.Object art.ControlData.waitFor
6: 0x0c: IfEqz v0, 0x26 (+26)
0x0e, line 44, locals: [3 -> start, 4 -> max, 5 -> data]
7: 0x0e: MonitorEnter v0
0x0f, line 45, locals: [3 -> start, 4 -> max, 5 -> data]
8: 0x0f: IgetObject v1, v5, Field java.util.concurrent.CountDownLatch art.ControlData.reached
9: 0x11: InvokeVirtual { v1 } Ljava/util/concurrent/CountDownLatch;->countDown()V
0x14, line 47, locals: [3 -> start, 4 -> max, 5 -> data]
10: 0x14: IgetObject v1, v5, Field java.lang.Object art.ControlData.waitFor
11: 0x16: InvokeVirtual { v1 } Ljava/lang/Object;->wait()V
hence the changed expectations.
Test: art/test/testrunner/testrunner.py -b --host -t 911-get-stack-trace
Change-Id: If10846b6be145dfda639f6ee78a455a8e6b891a9
diff --git a/test/911-get-stack-trace/expected.txt b/test/911-get-stack-trace/expected.txt
index b0a400a..995701d 100644
--- a/test/911-get-stack-trace/expected.txt
+++ b/test/911-get-stack-trace/expected.txt
@@ -79,7 +79,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -99,7 +99,7 @@
---------
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -120,13 +120,13 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
---------
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -153,7 +153,7 @@
###########################
From top
---------
- printOrWait (IILart/ControlData;)V 45 54
+ printOrWait (IILart/ControlData;)V 43 54
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -188,7 +188,7 @@
foo (IIILart/ControlData;)I 0 21
run ()V 4 61
---------
- printOrWait (IILart/ControlData;)V 45 54
+ printOrWait (IILart/ControlData;)V 43 54
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -274,7 +274,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -284,7 +284,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -294,7 +294,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -304,7 +304,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -314,7 +314,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -324,7 +324,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -334,7 +334,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -344,7 +344,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -354,7 +354,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -364,7 +364,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -399,7 +399,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -422,7 +422,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -445,7 +445,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -468,7 +468,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -491,7 +491,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -514,7 +514,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -537,7 +537,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -560,7 +560,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -583,7 +583,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -606,7 +606,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -683,7 +683,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -693,7 +693,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -703,7 +703,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -713,7 +713,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -723,7 +723,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -740,7 +740,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -763,7 +763,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -786,7 +786,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -809,7 +809,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -832,7 +832,7 @@
wait (JI)V -1 -2
wait (J)V 1 442
wait ()V 2 568
- printOrWait (IILart/ControlData;)V 24 47
+ printOrWait (IILart/ControlData;)V 22 47
baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
bar (IIILart/ControlData;)J 0 26
foo (IIILart/ControlData;)I 0 21
@@ -870,7 +870,7 @@
[public final native void java.lang.Object.wait(long,int) throws java.lang.InterruptedException, ffffffff]
[public final void java.lang.Object.wait(long) throws java.lang.InterruptedException, 1]
[public final void java.lang.Object.wait() throws java.lang.InterruptedException, 2]
-[private static void art.Recurse.printOrWait(int,int,art.ControlData), 18]
+[private static void art.Recurse.printOrWait(int,int,art.ControlData), 16]
[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 2]
[private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
[public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
@@ -894,7 +894,7 @@
###########################
17
JVMTI_ERROR_ILLEGAL_ARGUMENT
-[private static void art.Recurse.printOrWait(int,int,art.ControlData), 2d]
+[private static void art.Recurse.printOrWait(int,int,art.ControlData), 2b]
[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 2]
[private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
[public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
