diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-05-01 20:19:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-01 20:19:15 +0000 |
| commit | f274519ce9fc3a9df477ffb320bcdcddab505b58 (patch) | |
| tree | a8ec6aa9d77d8f7f774d2975c2a9a35bd4f878cd | |
| parent | 0697e8491217f980d90a769f241fed67f6827d6f (diff) | |
| parent | 175746ac9039e9b741d3521420dcaa9c59341738 (diff) | |
| download | art-f274519ce9fc3a9df477ffb320bcdcddab505b58.tar.gz art-f274519ce9fc3a9df477ffb320bcdcddab505b58.tar.bz2 art-f274519ce9fc3a9df477ffb320bcdcddab505b58.zip | |
Merge "Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)"
| -rw-r--r-- | runtime/gc/collector/mark_sweep.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index f0e8d14d25..c6d2861fe9 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -381,8 +381,8 @@ class MarkSweepMarkObjectSlowPath { if (UNLIKELY(obj == nullptr || !IsAligned<kPageSize>(obj) || (kIsDebugBuild && large_object_space != nullptr && !large_object_space->Contains(obj)))) { - LOG(ERROR) << "Tried to mark " << obj << " not contained by any spaces"; - LOG(ERROR) << "Attempting see if it's a bad root"; + LOG(INTERNAL_FATAL) << "Tried to mark " << obj << " not contained by any spaces"; + LOG(INTERNAL_FATAL) << "Attempting see if it's a bad root"; mark_sweep_->VerifyRoots(); LOG(FATAL) << "Can't mark invalid object"; } @@ -498,7 +498,7 @@ class VerifyRootVisitor : public SingleRootVisitor { if (heap->GetLiveBitmap()->GetContinuousSpaceBitmap(root) == nullptr) { space::LargeObjectSpace* large_object_space = heap->GetLargeObjectsSpace(); if (large_object_space != nullptr && !large_object_space->Contains(root)) { - LOG(ERROR) << "Found invalid root: " << root << " " << info; + LOG(INTERNAL_FATAL) << "Found invalid root: " << root << " " << info; } } } |