diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-05-01 13:00:23 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-05-01 13:20:24 -0700 |
| commit | 732e886df618f8f8f67a184da3bf079aec22eca5 (patch) | |
| tree | 9599bb4b3b1715c5b402d3bae1dc4bb339bc0fb6 /runtime/gc | |
| parent | 6db49a74e8402d3b6c66536ea7ec988144c05d24 (diff) | |
| download | art-732e886df618f8f8f67a184da3bf079aec22eca5.zip art-732e886df618f8f8f67a184da3bf079aec22eca5.tar.gz art-732e886df618f8f8f67a184da3bf079aec22eca5.tar.bz2 | |
Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)
INTERNAL_FATAL is more likely to remain in bug reports.
(cherry picked from commit 175746ac9039e9b741d3521420dcaa9c59341738)
Bug: 20736048
Change-Id: I518f079d8d1839e22b3595e807730edf36318f1d
Diffstat (limited to 'runtime/gc')
| -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 f0e8d14..c6d2861 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; } } } |