When was the last time -Xcheckinit was run? It ...

When was the last time -Xcheckinit was run? It must have been a long
time. All these changes are to address bugs revealed by -Xcheckinit,
mostly in test cases, some in the compiler. I'm guessing the partest
-Xcheckinit runs are hanging the first time they run into a failure, so
if it starts "working" again after this commit don't get too confident.
No review.

1 files changed, 6 insertions, 2 deletions

diff --git a/test/files/run/t3897/J_2.java b/test/files/run/t3897/J_2.java
index 5d5131737e..a4c9a98fb1 100644
--- a/test/files/run/t3897/J_2.java
+++ b/test/files/run/t3897/J_2.java
@@ -4,13 +4,17 @@ public class J_2 {
   public void f1(Class<?> clazz) {
     Field[] fields = clazz.getDeclaredFields();
     for (int i = 0 ; i < fields.length; i++) {
-      System.out.println("(" + fields[i].getName() + "," + fields[i].getGenericType() + ")");
+      String name = fields[i].getName();
+      if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
+      else System.out.println("(" + name + "," + fields[i].getGenericType() + ")");
     }
   }
   public void f2(Class<?> clazz) {
     Method[] methods = clazz.getDeclaredMethods();
     for (int i = 0 ; i < methods.length; i++) {
-      System.out.println("(" + methods[i].getName() + "," + methods[i].getGenericReturnType() + ")");
+      String name = methods[i].getName();
+      if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
+      else System.out.println("(" + name + "," + methods[i].getGenericReturnType() + ")");
     }
   }