diff options
| author | 2013-11-11 16:02:15 -0800 | |
|---|---|---|
| committer | 2013-11-11 16:02:15 -0800 | |
| commit | fb0c1951a6eeacd915618e324104e4d49e78d59e (patch) | |
| tree | f15893288b9046d1c2e55bdc381717c4d46e8120 | |
| parent | 13fc4add3b20d3e65912dd3d15ebeff7f8773748 (diff) | |
| parent | 08f20c63e2bd0c41d53a4c3ddaa34fd637f5405d (diff) | |
am 08f20c63: Change monitor checks to warnings in verifier.
* commit '08f20c63e2bd0c41d53a4c3ddaa34fd637f5405d':
Change monitor checks to warnings in verifier.
| -rw-r--r-- | runtime/verifier/register_line.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/verifier/register_line.cc b/runtime/verifier/register_line.cc index 1a41657264..31b0113d15 100644 --- a/runtime/verifier/register_line.cc +++ b/runtime/verifier/register_line.cc @@ -467,8 +467,8 @@ bool RegisterLine::MergeRegisters(const RegisterLine* incoming_line) { } } if (monitors_.size() != incoming_line->monitors_.size()) { - verifier_->Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "mismatched stack depths (depth=" - << MonitorStackDepth() << ", incoming depth=" << incoming_line->MonitorStackDepth() << ")"; + LOG(WARNING) << "mismatched stack depths (depth=" << MonitorStackDepth() + << ", incoming depth=" << incoming_line->MonitorStackDepth() << ")"; } else if (reg_to_lock_depths_ != incoming_line->reg_to_lock_depths_) { for (uint32_t idx = 0; idx < num_regs_; idx++) { size_t depths = reg_to_lock_depths_.count(idx); @@ -477,8 +477,8 @@ bool RegisterLine::MergeRegisters(const RegisterLine* incoming_line) { if (depths == 0 || incoming_depths == 0) { reg_to_lock_depths_.erase(idx); } else { - verifier_->Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "mismatched stack depths for register v" << idx - << ": " << depths << " != " << incoming_depths; + LOG(WARNING) << "mismatched stack depths for register v" << idx + << ": " << depths << " != " << incoming_depths; break; } } |