commit 0d72ce0b4f9eaf0f60c70a2901198099086795e0
author Andreas Gampe <agampe@google.com> Fri Jul 31 20:31:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 31 20:31:40 2015 +0000
tree f901760c078b4aca36cc24947b1b61294669f01f
parent 7423f0b66060711cddcdbc7ba5b0dd3f2df36718
parent 07e0e6b076b2b8d0a03f3caf94ff8c71fa807d29

Merge "Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors""

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.