From: Andreas Gampe <agampe@google.com>
Date: Fri, 31 Jul 2015 20:31:24 +0000 (+0000)
Subject: Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"
X-Git-Tag: android-x86-7.1-r1~889^2~641^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07e0e6b076b2b8d0a03f3caf94ff8c71fa807d29;p=android-x86%2Fart.git

Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

This reverts commit e93505f599682a2e95c4dac1c8633dec79c602bc.

This isn't the right thing to do, actually.

Bug: 22871329
Change-Id: I0a0a5a86c7c8d8afdf417444ca7d73e56e040515
---

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 021102e47..d63b45566 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -2873,10 +2873,6 @@ bool MethodVerifier::CodeFlowVerifyInstruction(uint32_t* start_guess) {
             break;
           }
         }
-      } else {
-        Fail(VERIFY_ERROR_BAD_CLASS_HARD)
-            << "return-void-no-barrier not expected for non-constructor method "
-            << PrettyMethod(dex_method_idx_, *dex_file_, true);
       }
       break;
     // Note: the following instructions encode offsets derived from class linking.