Merge "Add class table field to class loader"
diff --git a/libart/src/main/java/java/lang/ClassLoader.java b/libart/src/main/java/java/lang/ClassLoader.java
index dfbeeb5..860e4a1 100644
--- a/libart/src/main/java/java/lang/ClassLoader.java
+++ b/libart/src/main/java/java/lang/ClassLoader.java
@@ -92,6 +92,11 @@
private Map<String, Package> packages = new HashMap<String, Package>();
/**
+ * Pointer to the class table, only used from within the runtime.
+ */
+ private transient long classTable;
+
+ /**
* To avoid unloading individual classes, {@link java.lang.reflect.Proxy}
* only generates one class for each set of interfaces. This maps sets of
* interfaces to the proxy class that implements all of them. It is declared
diff --git a/luni/src/main/java/java/lang/reflect/Array.java b/luni/src/main/java/java/lang/reflect/Array.java
index a7dacfe..72e6717 100644
--- a/luni/src/main/java/java/lang/reflect/Array.java
+++ b/luni/src/main/java/java/lang/reflect/Array.java
@@ -371,7 +371,7 @@
} else if (componentType == void.class) {
throw new IllegalArgumentException("Can't allocate an array of void");
}
- throw new AssertionError();
+ throw new AssertionError(componentType.toString());
}
/*
