diff options
| author | 2025-02-20 01:20:08 -0800 | |
|---|---|---|
| committer | 2025-02-20 01:20:08 -0800 | |
| commit | b10a134d632a477c56897fd526e4b40d15ae11e8 (patch) | |
| tree | 4050dbfcdf827e9e17260476cfe6ad428973c7d7 | |
| parent | ee712c170cdd7c25de63209705e574e653b8ef4e (diff) | |
Revert "Temporarily enable post-gc heap verification"
This reverts commit ee712c170cdd7c25de63209705e574e653b8ef4e.
Reason for revert: <Droidmonitor created revert due to b/397818142.Will be verified through ABTD for standard investigation.>
Change-Id: I85604b18ccc8c4044cb7614f04567cd05b8f35c2
| -rw-r--r-- | cmdline/cmdline_types.h | 4 | ||||
| -rw-r--r-- | runtime/gc/collector/mark_compact.cc | 6 | ||||
| -rw-r--r-- | runtime/runtime.cc | 5 |
3 files changed, 1 insertions, 14 deletions
diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h index f2a96fa73f..524f181a8e 100644 --- a/cmdline/cmdline_types.h +++ b/cmdline/cmdline_types.h @@ -553,11 +553,7 @@ struct XGcOption { bool verify_pre_gc_heap_ = kIsDebugBuild; bool verify_pre_sweeping_heap_ = kIsDebugBuild; bool generational_gc = kEnableGenerationalGCByDefault; -#if defined(__x86_64__) || defined(__i386__) - bool verify_post_gc_heap_ = true; -#else bool verify_post_gc_heap_ = kIsDebugBuild; -#endif bool verify_pre_gc_rosalloc_ = kIsDebugBuild; bool verify_pre_sweeping_rosalloc_ = false; bool verify_post_gc_rosalloc_ = false; diff --git a/runtime/gc/collector/mark_compact.cc b/runtime/gc/collector/mark_compact.cc index cb314c5403..fafd8b55b4 100644 --- a/runtime/gc/collector/mark_compact.cc +++ b/runtime/gc/collector/mark_compact.cc @@ -4824,12 +4824,6 @@ void MarkCompact::FinishPhase(bool performed_compaction) { compacting_ = false; marking_done_ = false; uint8_t* mark_bitmap_clear_end = black_dense_end_; - LOG(INFO) << " black_dense_end:" << static_cast<void*>(black_dense_end_) - << " mid_gen_end:" << static_cast<void*>(mid_gen_end_) - << " post_compact_end:" << static_cast<void*>(post_compact_end_) - << " black_allocations_begin:" << static_cast<void*>(black_allocations_begin_) - << " young:" << young_gen_ << " performed_compaction:" << performed_compaction; - // Retain values of some fields for logging in next GC cycle, in case there is // a memory corruption detected. prev_black_allocations_begin_ = static_cast<void*>(black_allocations_begin_); diff --git a/runtime/runtime.cc b/runtime/runtime.cc index a1b77743cf..23e06ab792 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1790,9 +1790,6 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { (gUseUserfaultfd ? BackgroundGcOption(gc::kCollectorTypeCMCBackground) : runtime_options.GetOrDefault(Opt::BackgroundGc)); - bool verify_post_gc_heap = xgc_option.verify_post_gc_heap_ && - (android::base::GetProperty("ro.build.type", "") != "user"); - heap_ = new gc::Heap(runtime_options.GetOrDefault(Opt::MemoryInitialSize), runtime_options.GetOrDefault(Opt::HeapGrowthLimit), runtime_options.GetOrDefault(Opt::HeapMinFree), @@ -1825,7 +1822,7 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { runtime_options.GetOrDefault(Opt::UseTLAB), xgc_option.verify_pre_gc_heap_, xgc_option.verify_pre_sweeping_heap_, - verify_post_gc_heap, + xgc_option.verify_post_gc_heap_, xgc_option.verify_pre_gc_rosalloc_, xgc_option.verify_pre_sweeping_rosalloc_, xgc_option.verify_post_gc_rosalloc_, |