Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Side by Side Diff: runtime/vm/heap.cc

Issue 2962543002: Revert "VM: Reland Inline instance object hash code into object header on 64bit." (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « runtime/vm/heap.h ('k') | runtime/vm/intermediate_language_dbc.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/heap.h" 5 #include "vm/heap.h"
6 6
7 #include "platform/assert.h" 7 #include "platform/assert.h"
8 #include "platform/utils.h" 8 #include "platform/utils.h"
9 #include "vm/flags.h" 9 #include "vm/flags.h"
10 #include "vm/isolate.h" 10 #include "vm/isolate.h"
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 UNREACHABLE(); 658 UNREACHABLE();
659 return ""; 659 return "";
660 } 660 }
661 } 661 }
662 662
663 663
664 int64_t Heap::PeerCount() const { 664 int64_t Heap::PeerCount() const {
665 return new_weak_tables_[kPeers]->count() + old_weak_tables_[kPeers]->count(); 665 return new_weak_tables_[kPeers]->count() + old_weak_tables_[kPeers]->count();
666 } 666 }
667 667
668 #if !defined(HASH_IN_OBJECT_HEADER) 668
669 int64_t Heap::HashCount() const { 669 int64_t Heap::HashCount() const {
670 return new_weak_tables_[kHashes]->count() + 670 return new_weak_tables_[kHashes]->count() +
671 old_weak_tables_[kHashes]->count(); 671 old_weak_tables_[kHashes]->count();
672 } 672 }
673 #endif
674 673
675 674
676 int64_t Heap::ObjectIdCount() const { 675 int64_t Heap::ObjectIdCount() const {
677 return new_weak_tables_[kObjectIds]->count() + 676 return new_weak_tables_[kObjectIds]->count() +
678 old_weak_tables_[kObjectIds]->count(); 677 old_weak_tables_[kObjectIds]->count();
679 } 678 }
680 679
681 680
682 void Heap::ResetObjectIdTable() { 681 void Heap::ResetObjectIdTable() {
683 new_weak_tables_[kObjectIds]->Reset(); 682 new_weak_tables_[kObjectIds]->Reset();
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 Dart::vm_isolate()->heap()->WriteProtect(false); 877 Dart::vm_isolate()->heap()->WriteProtect(false);
879 } 878 }
880 879
881 880
882 WritableVMIsolateScope::~WritableVMIsolateScope() { 881 WritableVMIsolateScope::~WritableVMIsolateScope() {
883 ASSERT(Dart::vm_isolate()->heap()->UsedInWords(Heap::kNew) == 0); 882 ASSERT(Dart::vm_isolate()->heap()->UsedInWords(Heap::kNew) == 0);
884 Dart::vm_isolate()->heap()->WriteProtect(true); 883 Dart::vm_isolate()->heap()->WriteProtect(true);
885 } 884 }
886 885
887 } // namespace dart 886 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/heap.h ('k') | runtime/vm/intermediate_language_dbc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698