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

Side by Side Diff: src/heap-inl.h

Issue 993004: Fix, again, assertion so that it also compiles on Mac. (Closed)
Patch Set: Created 10 years, 9 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 Object* Heap::AllocateRawMap() { 126 Object* Heap::AllocateRawMap() {
127 #ifdef DEBUG 127 #ifdef DEBUG
128 Counters::objs_since_last_full.Increment(); 128 Counters::objs_since_last_full.Increment();
129 Counters::objs_since_last_young.Increment(); 129 Counters::objs_since_last_young.Increment();
130 #endif 130 #endif
131 Object* result = map_space_->AllocateRaw(Map::kSize); 131 Object* result = map_space_->AllocateRaw(Map::kSize);
132 if (result->IsFailure()) old_gen_exhausted_ = true; 132 if (result->IsFailure()) old_gen_exhausted_ = true;
133 #ifdef DEBUG 133 #ifdef DEBUG
134 if (!result->IsFailure()) { 134 if (!result->IsFailure()) {
135 // Maps have their own alignment. 135 // Maps have their own alignment.
136 CHECK_EQ(static_cast<intptr_t>(kHeapObjectTag), 136 CHECK((reinterpret_cast<intptr_t>(result) & kMapAlignmentMask) ==
137 reinterpret_cast<intptr_t>(result) & kMapAlignmentMask); 137 static_cast<intptr_t>(kHeapObjectTag));
138 } 138 }
139 #endif 139 #endif
140 return result; 140 return result;
141 } 141 }
142 142
143 143
144 Object* Heap::AllocateRawCell() { 144 Object* Heap::AllocateRawCell() {
145 #ifdef DEBUG 145 #ifdef DEBUG
146 Counters::objs_since_last_full.Increment(); 146 Counters::objs_since_last_full.Increment();
147 Counters::objs_since_last_young.Increment(); 147 Counters::objs_since_last_young.Increment();
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 415
416 416
417 void ExternalStringTable::ShrinkNewStrings(int position) { 417 void ExternalStringTable::ShrinkNewStrings(int position) {
418 new_space_strings_.Rewind(position); 418 new_space_strings_.Rewind(position);
419 Verify(); 419 Verify();
420 } 420 }
421 421
422 } } // namespace v8::internal 422 } } // namespace v8::internal
423 423
424 #endif // V8_HEAP_INL_H_ 424 #endif // V8_HEAP_INL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698