ART: Make verifier fail log level adjustable
To help for build failures.
Change-Id: I6c94dfb50177daa7d89902d78715ccec31bf0e45
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 5109443..3d5f84e 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -122,7 +122,7 @@
mirror::Class* klass,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
std::string* error) {
if (klass->IsVerified()) {
return kNoFailure;
@@ -161,7 +161,7 @@
class_def,
callbacks,
allow_soft_failures,
- log_hard_failures,
+ log_level,
error);
}
@@ -195,7 +195,7 @@
Handle<mirror::ClassLoader> class_loader,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
bool need_precise_constants,
std::string* error_string) {
DCHECK(it != nullptr);
@@ -236,7 +236,7 @@
it->GetMethodAccessFlags(),
callbacks,
allow_soft_failures,
- log_hard_failures,
+ log_level,
need_precise_constants,
&hard_failure_msg);
if (result.kind == kHardFailure) {
@@ -266,7 +266,7 @@
const DexFile::ClassDef* class_def,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
std::string* error) {
DCHECK(class_def != nullptr);
ScopedTrace trace(__FUNCTION__);
@@ -299,7 +299,7 @@
class_loader,
callbacks,
allow_soft_failures,
- log_hard_failures,
+ log_level,
false /* need precise constants */,
error);
// Virtual methods.
@@ -312,7 +312,7 @@
class_loader,
callbacks,
allow_soft_failures,
- log_hard_failures,
+ log_level,
false /* need precise constants */,
error);
@@ -360,7 +360,7 @@
uint32_t method_access_flags,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
bool need_precise_constants,
std::string* hard_failure_msg) {
MethodVerifier::FailureData result;
@@ -407,9 +407,12 @@
result.kind = kSoftFailure;
} else {
CHECK(verifier.have_pending_hard_failure_);
- if (VLOG_IS_ON(verifier) || log_hard_failures) {
- verifier.DumpFailures(LOG(INFO) << "Verification error in "
- << PrettyMethod(method_idx, *dex_file) << "\n");
+ if (VLOG_IS_ON(verifier)) {
+ log_level = LogSeverity::VERBOSE;
+ }
+ if (log_level > LogSeverity::VERBOSE) {
+ verifier.DumpFailures(LOG(log_level) << "Verification error in "
+ << PrettyMethod(method_idx, *dex_file) << "\n");
}
if (hard_failure_msg != nullptr) {
CHECK(!verifier.failure_messages_.empty());
diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h
index ba9bca0..ebb0b8c 100644
--- a/runtime/verifier/method_verifier.h
+++ b/runtime/verifier/method_verifier.h
@@ -142,12 +142,12 @@
kHardFailure,
};
- /* Verify a class. Returns "kNoFailure" on success. */
+ // Verify a class. Returns "kNoFailure" on success.
static FailureKind VerifyClass(Thread* self,
mirror::Class* klass,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
std::string* error)
SHARED_REQUIRES(Locks::mutator_lock_);
static FailureKind VerifyClass(Thread* self,
@@ -157,7 +157,7 @@
const DexFile::ClassDef* class_def,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
std::string* error)
SHARED_REQUIRES(Locks::mutator_lock_);
@@ -331,7 +331,7 @@
Handle<mirror::ClassLoader> class_loader,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
bool need_precise_constants,
std::string* error_string)
SHARED_REQUIRES(Locks::mutator_lock_);
@@ -357,7 +357,7 @@
uint32_t method_access_flags,
CompilerCallbacks* callbacks,
bool allow_soft_failures,
- bool log_hard_failures,
+ LogSeverity log_level,
bool need_precise_constants,
std::string* hard_failure_msg)
SHARED_REQUIRES(Locks::mutator_lock_);
diff --git a/runtime/verifier/method_verifier_test.cc b/runtime/verifier/method_verifier_test.cc
index 946f842..b036313 100644
--- a/runtime/verifier/method_verifier_test.cc
+++ b/runtime/verifier/method_verifier_test.cc
@@ -37,8 +37,13 @@
// Verify the class
std::string error_msg;
- ASSERT_TRUE(MethodVerifier::VerifyClass(self, klass, nullptr, true, true, &error_msg)
- == MethodVerifier::kNoFailure) << error_msg;
+ MethodVerifier::FailureKind failure = MethodVerifier::VerifyClass(self,
+ klass,
+ nullptr,
+ true,
+ LogSeverity::WARNING,
+ &error_msg);
+ ASSERT_TRUE(failure == MethodVerifier::kNoFailure) << error_msg;
}
void VerifyDexFile(const DexFile& dex)