commit 9fc16eb43fe938f0cddb13638bd7cbc2ea9534a2
author Ian Rogers <irogers@google.com> Wed Jul 31 14:49:16 2013 -0700
committer Ian Rogers <irogers@google.com> Wed Jul 31 14:52:50 2013 -0700
tree 42be6682a5c6540c944a37c62f82c5635ab9e81e
parent 0418ae2bdd996b64f733b1290080e3f98a05609f

Don't add barriers to clinit methods.

Change-Id: I13e6c008feb8c19e452d6e2f88b2bbbcac997de5

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 9f0d911..6cc74de 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -2507,8 +2507,8 @@
 
     // Special instructions.
     case Instruction::RETURN_VOID_BARRIER:
-      DCHECK(Runtime::Current()->IsStarted());
-      if (!IsConstructor()) {
+      DCHECK(Runtime::Current()->IsStarted()) << PrettyMethod(dex_method_idx_, *dex_file_);
+      if (!IsConstructor() || IsStatic()) {
           Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "return-void-barrier not expected";
       }
       break;