Remove special support for D8 in 911-get-stack-trace

This test produced slightly different output when run using D8 compared
with DX. As D8 is the default and DX is no longer used this removes the
special support for D8 and updates the expected output to match.

Test: art/test/testrunner/testrunner.py
Change-Id: Icd1f4e547c13bf6641202ac086d567895e1b83a4
diff --git a/test/911-get-stack-trace/check b/test/911-get-stack-trace/check
deleted file mode 100644
index ee00266..0000000
--- a/test/911-get-stack-trace/check
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [[ "$DX" == 'd8' ]]; then
-  patch -p0 expected.txt < expected_d8.diff
-fi
-
-./default-check "$@"
-if [[ "$?" == "0" ]]; then
-  exit 0;
-fi
-
-# We cannot always correctly determine if D8 was used because of (b/68406220).
-# So we are just going to try to see it matches the expect output of D8 no
-# matter what.
-patch -p0 expected.txt < expected_d8.diff
-
-./default-check "$@"
diff --git a/test/911-get-stack-trace/expected.txt b/test/911-get-stack-trace/expected.txt
index 8177f49..544fb7d 100644
--- a/test/911-get-stack-trace/expected.txt
+++ b/test/911-get-stack-trace/expected.txt
@@ -9,19 +9,19 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- doTest ()V 34 25
+ doTest ()V 33 25
  run ()V 0 25
 ---------
  print (Ljava/lang/Thread;II)V 0 38
@@ -29,19 +29,19 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- doTest ()V 38 26
+ doTest ()V 37 26
  run ()V 0 25
 ---------
  getStackTrace (Ljava/lang/Thread;II)[[Ljava/lang/String; -1 -2
@@ -54,12 +54,12 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
 From bottom
 ---------
  run ()V 0 25
 ---------
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  doTest ()V 60 32
@@ -67,7 +67,7 @@
 ---------
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
 
@@ -81,16 +81,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 28
@@ -99,16 +99,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 28
@@ -122,22 +122,22 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
 From bottom
 ---------
  run ()V 4 28
 ---------
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 28
 ---------
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
 
 ###########################
@@ -145,20 +145,20 @@
 ###########################
 From top
 ---------
- printOrWait (IILart/ControlData;)V 44 54
+ printOrWait (IILart/ControlData;)V 45 54
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 61
@@ -166,29 +166,29 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 61
 ---------
- printOrWait (IILart/ControlData;)V 44 54
+ printOrWait (IILart/ControlData;)V 45 54
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
 ---------
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
 From bottom
@@ -196,15 +196,15 @@
  run ()V 4 61
 ---------
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 61
 ---------
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
 
 ################################
@@ -360,7 +360,7 @@
 Test911
  getAllStackTraces (I)[[Ljava/lang/Object; -1 -2
  printAll (I)V 0 75
- doTest ()V 122 59
+ doTest ()V 120 59
  run ()V 24 37
 
 ---------
@@ -373,16 +373,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -394,16 +394,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -415,16 +415,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -436,16 +436,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -457,16 +457,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -478,16 +478,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -499,16 +499,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -520,16 +520,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -541,16 +541,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -562,16 +562,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 47
@@ -595,7 +595,7 @@
 Test911
  getAllStackTraces (I)[[Ljava/lang/Object; -1 -2
  printAll (I)V 0 75
- doTest ()V 127 61
+ doTest ()V 125 61
  run ()V 24 37
 
 ---------
@@ -627,7 +627,7 @@
 Test911
  getThreadListStackTraces ([Ljava/lang/Thread;I)[[Ljava/lang/Object; -1 -2
  printList ([Ljava/lang/Thread;I)V 0 68
- doTest ()V 112 54
+ doTest ()V 110 54
  run ()V 32 41
 
 ---------
@@ -674,7 +674,7 @@
 Test911
  getThreadListStackTraces ([Ljava/lang/Thread;I)[[Ljava/lang/Object; -1 -2
  printList ([Ljava/lang/Thread;I)V 0 68
- doTest ()V 117 56
+ doTest ()V 115 56
  run ()V 32 41
 
 ---------
@@ -684,16 +684,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 37
@@ -705,16 +705,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 37
@@ -726,16 +726,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 37
@@ -747,16 +747,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 37
@@ -768,16 +768,16 @@
  baz (IIILart/ControlData;)Ljava/lang/Object; 2 32
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
- baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
+ baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
  bar (IIILart/ControlData;)J 0 26
  foo (IIILart/ControlData;)I 0 21
  run ()V 4 37
@@ -789,7 +789,7 @@
 4
 JVMTI_ERROR_ILLEGAL_ARGUMENT
 [public static native java.lang.Object[] art.Frames.getFrameLocation(java.lang.Thread,int), ffffffff]
-[public static void art.Frames.doTestSameThread(), 35]
+[public static void art.Frames.doTestSameThread(), 40]
 [public static void art.Frames.doTest() throws java.lang.Exception, 0]
 [public void art.Test911$1.run(), 28]
 JVMTI_ERROR_NO_MORE_FRAMES
@@ -804,16 +804,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]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
 [public void art.Frames$1.run(), 4]
@@ -824,20 +824,20 @@
 ###########################
 17
 JVMTI_ERROR_ILLEGAL_ARGUMENT
-[private static void art.Recurse.printOrWait(int,int,art.ControlData), 2c]
+[private static void art.Recurse.printOrWait(int,int,art.ControlData), 2d]
 [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]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
-[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
+[private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
 [private static long art.Recurse.bar(int,int,int,art.ControlData), 0]
 [public static int art.Recurse.foo(int,int,int,art.ControlData), 0]
 [public void art.Frames$2.run(), 4]
diff --git a/test/911-get-stack-trace/expected_d8.diff b/test/911-get-stack-trace/expected_d8.diff
deleted file mode 100644
index c12015a..0000000
--- a/test/911-get-stack-trace/expected_d8.diff
+++ /dev/null
@@ -1,456 +0,0 @@
-12c12
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-15c15
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-18c18
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-21c21
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-24c24
-<  doTest ()V 34 25
----
->  doTest ()V 33 25
-32c32
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-35c35
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-38c38
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-41c41
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-44c44
-<  doTest ()V 38 26
----
->  doTest ()V 37 26
-57c57
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-62c62
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-70c70
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-84c84
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-87c87
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-90c90
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-93c93
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-102c102
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-105c105
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-108c108
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-111c111
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-125c125
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-132c132
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-137c137
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-140c140
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-148c148
-<  printOrWait (IILart/ControlData;)V 44 54
----
->  printOrWait (IILart/ControlData;)V 45 54
-152c152
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-155c155
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-158c158
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-161c161
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-169c169
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-172c172
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-175c175
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-178c178
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-183c183
-<  printOrWait (IILart/ControlData;)V 44 54
----
->  printOrWait (IILart/ControlData;)V 45 54
-187c187
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-191c191
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-199c199
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-204c204
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-207c207
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-363c363
-<  doTest ()V 122 59
----
->  doTest ()V 120 59
-376c376
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-379c379
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-382c382
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-385c385
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-397c397
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-400c400
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-403c403
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-406c406
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-418c418
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-421c421
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-424c424
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-427c427
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-439c439
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-442c442
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-445c445
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-448c448
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-460c460
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-463c463
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-466c466
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-469c469
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-481c481
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-484c484
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-487c487
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-490c490
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-502c502
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-505c505
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-508c508
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-511c511
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-523c523
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-526c526
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-529c529
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-532c532
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-544c544
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-547c547
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-550c550
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-553c553
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-565c565
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-568c568
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-571c571
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-574c574
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-598c598
-<  doTest ()V 127 61
----
->  doTest ()V 125 61
-630c630
-<  doTest ()V 112 54
----
->  doTest ()V 110 54
-677c677
-<  doTest ()V 117 56
----
->  doTest ()V 115 56
-687c687
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-690c690
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-693c693
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-696c696
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-708c708
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-711c711
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-714c714
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-717c717
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-729c729
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-732c732
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-735c735
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-738c738
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-750c750
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-753c753
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-756c756
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-759c759
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-771c771
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-774c774
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-777c777
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-780c780
-<  baz (IIILart/ControlData;)Ljava/lang/Object; 9 34
----
->  baz (IIILart/ControlData;)Ljava/lang/Object; 8 34
-792c792
-< [public static void art.Frames.doTestSameThread(), 35]
----
-> [public static void art.Frames.doTestSameThread(), 40]
-807c807
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
-810c810
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
-813c813
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
-816c816
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
-827c827
-< [private static void art.Recurse.printOrWait(int,int,art.ControlData), 2c]
----
-> [private static void art.Recurse.printOrWait(int,int,art.ControlData), 2d]
-831c831
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
-834c834
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
-837c837
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]
-840c840
-< [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 9]
----
-> [private static java.lang.Object art.Recurse.baz(int,int,int,art.ControlData), 8]