Reviewers: Michael Lippautz,

Description:
Revert "Regularly check hash set addresses to verify memory integrity."

This debug check is not needed anymore.

This reverts commit ce311ed00123be1ffefdfbee39bd67cec63599ed.

BUG=

Please review this at https://codereview.chromium.org/1300663002/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+0, -28 lines):
  M src/heap/store-buffer.cc
  M src/isolate.h
  M src/isolate.cc


Index: src/heap/store-buffer.cc
diff --git a/src/heap/store-buffer.cc b/src/heap/store-buffer.cc
index e6430d5a2ab3b7156234dd3673b61e6fcff6fc78..8de66d7a8ec3dc5fbdaba6b3292837564fad4b4f 100644
--- a/src/heap/store-buffer.cc
+++ b/src/heap/store-buffer.cc
@@ -92,9 +92,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_);
 }


@@ -529,9 +526,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<Address*>(heap_->store_buffer_top());

   if (top == start_) return;
Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index 59b32ebf1a4229769510a56aae8158a2e63a3db0..a96a3f2a36ac052324e08c85a8d12781c0c98cc1 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),
Index: src/isolate.h
diff --git a/src/isolate.h b/src/isolate.h
index bb1fa417b26244136fd47faf537ef0b5d589c81b..3cc4bacfdec70f14ef337263c38b7df5b6f44bce 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> context);
   void CheckDetachedContextsAfterGC();
@@ -1307,9 +1290,6 @@ class Isolate {
unibrow::Mapping<unibrow::Ecma262Canonicalize> 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_;


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to