commit 07e0e6b076b2b8d0a03f3caf94ff8c71fa807d29
author Andreas Gampe <agampe@google.com> Fri Jul 31 20:31:24 2015 +0000
committer Andreas Gampe <agampe@google.com> Fri Jul 31 20:31:24 2015 +0000
tree 59476c1461aa80decc80e5bf2c0bf490d387ab01
parent e93505f599682a2e95c4dac1c8633dec79c602bc

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

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 021102e..d63b455 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -2873,10 +2873,6 @@
             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.