Merge "Don't force optimizations during class init in dexopt." into dalvik-dev

diff --git a/vm/Init.c b/vm/Init.c
index 0b96d3b..07b3ad8 100644 (file)
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -1554,11 +1554,10 @@ static bool dvmInitJDWP(void)
  * of initialization and then returns with "initializing" still set.  (Used
  * by DexOpt command-line utility.)
  *
- * Attempting to use JNI or internal natives will fail.  It's best if
- * no bytecode gets executed, which means no <clinit>, which means no
- * exception-throwing.  We check the "initializing" flag anyway when
- * throwing an exception, so we can insert some code that avoids chucking
- * an exception when we're optimizing stuff.
+ * Attempting to use JNI or internal natives will fail.  It's best
+ * if no bytecode gets executed, which means no <clinit>, which means
+ * no exception-throwing.  (In practice we need to initialize Class and
+ * Object, and probably some exception classes.)
  *
  * Returns 0 on success.
  */

diff --git a/vm/oo/Class.c b/vm/oo/Class.c
index 9de277f..c6b169f 100644 (file)
--- a/vm/oo/Class.c
+++ b/vm/oo/Class.c
@@ -4308,8 +4308,17 @@ noverify:
      * We need to ensure that certain instructions, notably accesses to
      * volatile fields, are replaced before any code is executed.  This
      * must happen even if DEX optimizations are disabled.
+     *
+     * The only exception to this rule is that we don't want to do this
+     * during dexopt.  We don't generally initialize classes at all
+     * during dexopt, but because we're loading classes we need Class and
+     * Object (and possibly some Throwable stuff if a class isn't found).
+     * If optimizations are disabled, we don't want to output optimized
+     * instructions at this time.  This means we will be executing <clinit>
+     * code with un-fixed volatiles, but we're only doing it for a few
+     * system classes, and dexopt runs single-threaded.
      */
-    if (!IS_CLASS_FLAG_SET(clazz, CLASS_ISOPTIMIZED)) {
+    if (!IS_CLASS_FLAG_SET(clazz, CLASS_ISOPTIMIZED) && !gDvm.optimizing) {
         LOGV("+++ late optimize on %s (pv=%d)\n",
             clazz->descriptor, IS_CLASS_FLAG_SET(clazz, CLASS_ISPREVERIFIED));
         dvmOptimizeClass(clazz, true);