Yak-shaving in support of the exception cleanup.

This change restructures where early class initialization happens in
the VM, moving a few chunks of it together into Init.c. The exception
classes get moved here as well as the super-core classes needed
particularly for dex optimization. This is all done to support a follow-up
change that will put more of the verifier's required exceptions into
the list. (Before this change, it would have been unsafe to do that.)

This change also paves the way for further consolidation of class and
member initialization, which I hope will make it easier to transition
the whole mess into the new copying-gc world, when that arrives on the
scene.

Bug: 3500987
Change-Id: I0caae09432a05287af53aa36a6663997ab310985

1 files changed, 8 insertions, 0 deletions

diff --git a/vm/Init.h b/vm/Init.h
index 63051a25d..ac04bf40b 100644
--- a/vm/Init.h
+++ b/vm/Init.h
@@ -41,6 +41,14 @@ int dvmPrepForDexOpt(const char* bootClassPath, DexOptimizerMode dexOptMode,
     DexClassVerifyMode verifyMode, int dexoptFlags);
 
 /*
+ * Look up the set of classes and members used directly by the VM, storing
+ * them into the globals instance. See Globals.h. This function is exposed
+ * so that dex optimization may call it (while avoiding doing other
+ * unnecessary VM initialization).
+ */
+int dvmInitRequiredClassesAndMembers(void);
+
+/*
  * Replacement for fprintf() when we want to send a message to the console.
  * This defaults to fprintf(), but will use the JNI fprintf callback if
  * one was provided.