commit c7a12b2fc8270722c7de8d24fd8fa943e5ef1818
author Andy McFadden <fadden@android.com> Fri Apr 30 10:08:55 2010 -0700
committer Andy McFadden <fadden@android.com> Fri Apr 30 10:08:55 2010 -0700
tree ea355f1e6a7bc6b20c767e21fd0d42038166332a
parent c2c61e2aa059bcdbbcb69ea0e381b93ec8c1d87f

Minor tweaks.

Leftovers from https://android-git.corp.google.com/g/49613 .

Change-Id: Ife57a36e93a9d7f4d953a88b79ed1d58d6d490cb

vm/interp/Interp.c

diff --git a/vm/interp/Interp.c b/vm/interp/Interp.c
index 807afad..e8b0b00 100644
--- a/vm/interp/Interp.c
+++ b/vm/interp/Interp.c
@@ -238,28 +238,25 @@
          * but since we don't execute unverified code we don't need to
          * alter the bytecode yet.
          *
-         * The class init code will "flush" all relevant breakpoints when
-         * verification completes.
+         * The class init code will "flush" all pending opcode writes
+         * before verification completes.
          */
-        MEM_BARRIER();
         assert(*(u1*)addr != OP_BREAKPOINT);
         if (dvmIsClassVerified(method->clazz)) {
             LOGV("Class %s verified, adding breakpoint at %p\n",
                 method->clazz->descriptor, addr);
+            MEM_BARRIER();
             dvmDexChangeDex1(method->clazz->pDvmDex, (u1*)addr, OP_BREAKPOINT);
         } else {
             LOGV("Class %s NOT verified, deferring breakpoint at %p\n",
                 method->clazz->descriptor, addr);
         }
     } else {
+        /*
+         * Breakpoint already exists, just increase the count.
+         */
         pBreak = &pSet->breakpoints[idx];
         pBreak->setCount++;
-
-        /*
-         * Instruction stream may not have breakpoint opcode yet -- flush
-         * may be pending during verification of class.
-         */
-        //assert(*(u1*)addr == OP_BREAKPOINT);
     }
 
     return true;