commit b5cc1d1321e36d38cd48ae079438a8758b82edc1
author Narayan Kamath <narayan@google.com> Fri Oct 28 11:50:47 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 28 11:50:47 2016 +0000
tree e57fb4583c8691fd9771bf1523b7439ba64f9766
parent 68e4f6b7db83241e0081787f9cdb4fa1465db313
parent 56ee489d6e90aa255a91d268c0822fb3553c7f4e

Merge "method_verifier_test: Allow soft verifier failures for java/lang/invoke.*"

runtime/verifier/method_verifier_test.cc

diff --git a/runtime/verifier/method_verifier_test.cc b/runtime/verifier/method_verifier_test.cc
index 837ee2d..52be2df 100644
--- a/runtime/verifier/method_verifier_test.cc
+++ b/runtime/verifier/method_verifier_test.cc
@@ -23,6 +23,7 @@
 #include "common_runtime_test.h"
 #include "dex_file.h"
 #include "scoped_thread_state_change-inl.h"
+#include "utils.h"
 #include "verifier_log_mode.h"
 
 namespace art {
@@ -40,7 +41,14 @@
     std::string error_msg;
     MethodVerifier::FailureKind failure = MethodVerifier::VerifyClass(
         self, klass, nullptr, true, HardFailLogMode::kLogWarning, &error_msg);
-    ASSERT_TRUE(failure == MethodVerifier::kNoFailure) << error_msg;
+
+    if (StartsWith(descriptor, "Ljava/lang/invoke")) {
+      ASSERT_TRUE(failure == MethodVerifier::kSoftFailure ||
+                  failure == MethodVerifier::kNoFailure) << error_msg;
+
+    } else {
+      ASSERT_TRUE(failure == MethodVerifier::kNoFailure) << error_msg;
+    }
   }
 
   void VerifyDexFile(const DexFile& dex)