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

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

Issue 2953753002: Revert "Inline instance object hash code into object header on 64 bit." (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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 UNREACHABLE(); 646 UNREACHABLE();
647 return ""; 647 return "";
648 } 648 }
649 } 649 }
650 650
651 651
652 int64_t Heap::PeerCount() const { 652 int64_t Heap::PeerCount() const {
653 return new_weak_tables_[kPeers]->count() + old_weak_tables_[kPeers]->count(); 653 return new_weak_tables_[kPeers]->count() + old_weak_tables_[kPeers]->count();
654 } 654 }
655 655
656 #if !defined(HASH_IN_OBJECT_HEADER) 656
657 int64_t Heap::HashCount() const { 657 int64_t Heap::HashCount() const {
658 return new_weak_tables_[kHashes]->count() + 658 return new_weak_tables_[kHashes]->count() +
659 old_weak_tables_[kHashes]->count(); 659 old_weak_tables_[kHashes]->count();
660 } 660 }
661 #endif
662 661
663 662
664 int64_t Heap::ObjectIdCount() const { 663 int64_t Heap::ObjectIdCount() const {
665 return new_weak_tables_[kObjectIds]->count() + 664 return new_weak_tables_[kObjectIds]->count() +
666 old_weak_tables_[kObjectIds]->count(); 665 old_weak_tables_[kObjectIds]->count();
667 } 666 }
668 667
669 668
670 void Heap::ResetObjectIdTable() { 669 void Heap::ResetObjectIdTable() {
671 new_weak_tables_[kObjectIds]->Reset(); 670 new_weak_tables_[kObjectIds]->Reset();
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 Dart::vm_isolate()->heap()->WriteProtect(false); 865 Dart::vm_isolate()->heap()->WriteProtect(false);
867 } 866 }
868 867
869 868
870 WritableVMIsolateScope::~WritableVMIsolateScope() { 869 WritableVMIsolateScope::~WritableVMIsolateScope() {
871 ASSERT(Dart::vm_isolate()->heap()->UsedInWords(Heap::kNew) == 0); 870 ASSERT(Dart::vm_isolate()->heap()->UsedInWords(Heap::kNew) == 0);
872 Dart::vm_isolate()->heap()->WriteProtect(true); 871 Dart::vm_isolate()->heap()->WriteProtect(true);
873 } 872 }
874 873
875 } // namespace dart 874 } // 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