Revert "[vm] Avoid holding canonical hashes at rest."

rmacnak-google · commit-bot@chromium.org · commit ec81b3edf7ab · 2019-11-21T23:58:30.000Z
This reverts commit b7de866. Reason for revert: assertion failures on reload stress bots Original change's description: > [vm] Avoid holding canonical hashes at rest. > > Canonical hashes are only stored during a round of canonicalization to avoid expontential time in cases such as those in tests/language_2/canonicalization_hasing_*. Clearing them avoids the GC spending time to visit them. > > Bug: #37523 > Change-Id: Icad1fad30dcb7eb95864bea8a26991aeccd7adc6 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125760 > Reviewed-by: Alexander Markov <alexmarkov@google.com> > Reviewed-by: Siva Annamalai <asiva@google.com> > Commit-Queue: Ryan Macnak <rmacnak@google.com> TBR=rmacnak@google.com,alexmarkov@google.com,asiva@google.com Change-Id: I2e6b29fd1b529d6302ab979acd4757f45bf989ef No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: #37523 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125935 Reviewed-by: Ryan Macnak <rmacnak@google.com> Commit-Queue: Ryan Macnak <rmacnak@google.com>
diff --git a/runtime/vm/heap/marker.cc b/runtime/vm/heap/marker.cc
@@ -497,8 +497,6 @@ void GCMarker::IterateWeakRoots(HandleVisitor* visitor) {
 }
 
 void GCMarker::ProcessWeakTables(PageSpace* page_space) {
-  TIMELINE_FUNCTION_GC_DURATION(Thread::Current(), "ProcessWeakTables");
-
   for (int sel = 0; sel < Heap::kNumWeakSelectors; sel++) {
     WeakTable* table =
         heap_->GetWeakTable(Heap::kOld, static_cast<Heap::WeakSelector>(sel));
diff --git a/runtime/vm/heap/scavenger.cc b/runtime/vm/heap/scavenger.cc
@@ -831,8 +831,6 @@ uword Scavenger::ProcessWeakProperty(RawWeakProperty* raw_weak,
 }
 
 void Scavenger::ProcessWeakReferences() {
-  TIMELINE_FUNCTION_GC_DURATION(Thread::Current(), "ProcessWeakReferences");
-
   auto rehash_weak_table = [](WeakTable* table, WeakTable* replacement_new,
                               WeakTable* replacement_old) {
     intptr_t size = table->size();
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
@@ -540,7 +540,6 @@ void Isolate::RehashConstants() {
   StackZone stack_zone(thread);
   Zone* zone = stack_zone.GetZone();
 
-  // Clear any old hashes, which may have become invalid.
   thread->heap()->ResetCanonicalHashTable();
 
   Class& cls = Class::Handle(zone);
@@ -558,12 +557,6 @@ void Isolate::RehashConstants() {
     cls = class_table()->At(cid);
     cls.RehashConstants(zone);
   }
-
-  // Canonical hashes are only stored during a round of canonicalization to
-  // avoid expontential time in cases such as those in
-  // tests/language_2/canonicalization_hasing_*. Clear them after
-  // canonicalization is done so the GC won't need to update them.
-  thread->heap()->ResetCanonicalHashTable();
 }
 
 #if defined(DEBUG)
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
@@ -3766,11 +3766,6 @@ RawError* Class::EnsureIsFinalized(Thread* thread) const {
       UNREACHABLE();
     }
   }
-  // Canonical hashes are only stored during a round of canonicalization to
-  // avoid expontential time in cases such as those in
-  // tests/language_2/canonicalization_hasing_*. Clear them after
-  // canonicalization is done so the GC won't need to update them.
-  thread->heap()->ResetCanonicalHashTable();
   return error.raw();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -497,8 +497,6 @@ void GCMarker::IterateWeakRoots(HandleVisitor* visitor) {`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`void GCMarker::ProcessWeakTables(PageSpace* page_space) {`
`500`		`- TIMELINE_FUNCTION_GC_DURATION(Thread::Current(), "ProcessWeakTables");`
`501`		`-`
`502`	`500`	`for (int sel = 0; sel < Heap::kNumWeakSelectors; sel++) {`
`503`	`501`	`WeakTable* table =`
`504`	`502`	`heap_->GetWeakTable(Heap::kOld, static_cast<Heap::WeakSelector>(sel));`
Original file line number	Diff line number	Diff line change
`@@ -831,8 +831,6 @@ uword Scavenger::ProcessWeakProperty(RawWeakProperty* raw_weak,`
`831`	`831`	`}`
`832`	`832`
`833`	`833`	`void Scavenger::ProcessWeakReferences() {`
`834`		`- TIMELINE_FUNCTION_GC_DURATION(Thread::Current(), "ProcessWeakReferences");`
`835`		`-`
`836`	`834`	`auto rehash_weak_table = [](WeakTable* table, WeakTable* replacement_new,`
`837`	`835`	`WeakTable* replacement_old) {`
`838`	`836`	`intptr_t size = table->size();`
Original file line number	Diff line number	Diff line change
`@@ -3766,11 +3766,6 @@ RawError* Class::EnsureIsFinalized(Thread* thread) const {`
`3766`	`3766`	`UNREACHABLE();`
`3767`	`3767`	`}`
`3768`	`3768`	`}`
`3769`		`- // Canonical hashes are only stored during a round of canonicalization to`
`3770`		`- // avoid expontential time in cases such as those in`
`3771`		`- // tests/language_2/canonicalization_hasing_*. Clear them after`
`3772`		`- // canonicalization is done so the GC won't need to update them.`
`3773`		`- thread->heap()->ResetCanonicalHashTable();`
`3774`	`3769`	`return error.raw();`
`3775`	`3770`	`}`
`3776`	`3771`