From 225a2b6f93e9b79f8e4868b52f8878da65a2594a Mon Sep 17 00:00:00 2001 From: hpayer Date: Mon, 17 Aug 2015 11:25:11 -0700 Subject: [PATCH] Revert "Regularly check hash set addresses to verify memory integrity." This debug check is not needed anymore. This reverts commit ce311ed00123be1ffefdfbee39bd67cec63599ed. BUG= Review URL: https://codereview.chromium.org/1300663002 Cr-Commit-Position: refs/heads/master@{#30205} --- src/heap/store-buffer.cc | 6 ------ src/isolate.cc | 2 -- src/isolate.h | 20 -------------------- 3 files changed, 28 deletions(-) diff --git a/src/heap/store-buffer.cc b/src/heap/store-buffer.cc index 97dcf1b..95fb83c 100644 --- a/src/heap/store-buffer.cc +++ b/src/heap/store-buffer.cc @@ -93,9 +93,6 @@ void StoreBuffer::SetUp() { hash_sets_are_empty_ = false; ClearFilteringHashSets(); - - heap_->isolate()->set_store_buffer_hash_set_1_address(hash_set_1_); - heap_->isolate()->set_store_buffer_hash_set_2_address(hash_set_2_); } @@ -530,9 +527,6 @@ void StoreBuffer::IteratePointersToNewSpace(ObjectSlotCallback slot_callback) { void StoreBuffer::Compact() { - CHECK(hash_set_1_ == heap_->isolate()->store_buffer_hash_set_1_address()); - CHECK(hash_set_2_ == heap_->isolate()->store_buffer_hash_set_2_address()); - Address* top = reinterpret_cast(heap_->store_buffer_top()); if (top == start_) return; diff --git a/src/isolate.cc b/src/isolate.cc index 06e3c61..06cca0a 100644 --- a/src/isolate.cc +++ b/src/isolate.cc @@ -1758,8 +1758,6 @@ Isolate::Isolate(bool enable_serializer) // TODO(bmeurer) Initialized lazily because it depends on flags; can // be fixed once the default isolate cleanup is done. random_number_generator_(NULL), - store_buffer_hash_set_1_address_(NULL), - store_buffer_hash_set_2_address_(NULL), serializer_enabled_(enable_serializer), has_fatal_error_(false), initialized_from_snapshot_(false), diff --git a/src/isolate.h b/src/isolate.h index bb1fa41..3cc4bac 100644 --- a/src/isolate.h +++ b/src/isolate.h @@ -1110,23 +1110,6 @@ class Isolate { int GetNextUniqueSharedFunctionInfoId() { return next_unique_sfi_id_++; } #endif - void set_store_buffer_hash_set_1_address( - uintptr_t* store_buffer_hash_set_1_address) { - store_buffer_hash_set_1_address_ = store_buffer_hash_set_1_address; - } - - uintptr_t* store_buffer_hash_set_1_address() { - return store_buffer_hash_set_1_address_; - } - - void set_store_buffer_hash_set_2_address( - uintptr_t* store_buffer_hash_set_2_address) { - store_buffer_hash_set_2_address_ = store_buffer_hash_set_2_address; - } - - uintptr_t* store_buffer_hash_set_2_address() { - return store_buffer_hash_set_2_address_; - } void AddDetachedContext(Handle context); void CheckDetachedContextsAfterGC(); @@ -1307,9 +1290,6 @@ class Isolate { unibrow::Mapping interp_canonicalize_mapping_; CallInterfaceDescriptorData* call_descriptor_data_; base::RandomNumberGenerator* random_number_generator_; - // TODO(hpayer): Remove the following store buffer addresses. - uintptr_t* store_buffer_hash_set_1_address_; - uintptr_t* store_buffer_hash_set_2_address_; // Whether the isolate has been created for snapshotting. bool serializer_enabled_; -- 2.7.4