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

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

Issue 11275229: Fix assert in Page::Initialize. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« 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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 #endif 157 #endif
158 158
159 159
160 // -------------------------------------------------------------------------- 160 // --------------------------------------------------------------------------
161 // PagedSpace 161 // PagedSpace
162 Page* Page::Initialize(Heap* heap, 162 Page* Page::Initialize(Heap* heap,
163 MemoryChunk* chunk, 163 MemoryChunk* chunk,
164 Executability executable, 164 Executability executable,
165 PagedSpace* owner) { 165 PagedSpace* owner) {
166 Page* page = reinterpret_cast<Page*>(chunk); 166 Page* page = reinterpret_cast<Page*>(chunk);
167 ASSERT(chunk->size() <= static_cast<size_t>(kPageSize)); 167 ASSERT(page->area_size() <= kPageSize);
Michael Starzinger 2012/11/14 14:43:54 This should actually be ASSERT(page->area_size() <
168 // Code range allocation can return chunks larger than a page.
169 ASSERT(chunk->size() <= static_cast<size_t>(kPageSize) ||
Michael Starzinger 2012/11/14 14:43:54 I am not sure if we should even have this second a
170 executable == EXECUTABLE);
168 ASSERT(chunk->owner() == owner); 171 ASSERT(chunk->owner() == owner);
169 owner->IncreaseCapacity(page->area_size()); 172 owner->IncreaseCapacity(page->area_size());
170 owner->Free(page->area_start(), page->area_size()); 173 owner->Free(page->area_start(), page->area_size());
171 174
172 heap->incremental_marking()->SetOldSpacePageFlags(chunk); 175 heap->incremental_marking()->SetOldSpacePageFlags(chunk);
173 176
174 return page; 177 return page;
175 } 178 }
176 179
177 180
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 Map* map = object->map(); 375 Map* map = object->map();
373 Heap* heap = object->GetHeap(); 376 Heap* heap = object->GetHeap();
374 return map == heap->raw_unchecked_free_space_map() 377 return map == heap->raw_unchecked_free_space_map()
375 || map == heap->raw_unchecked_one_pointer_filler_map() 378 || map == heap->raw_unchecked_one_pointer_filler_map()
376 || map == heap->raw_unchecked_two_pointer_filler_map(); 379 || map == heap->raw_unchecked_two_pointer_filler_map();
377 } 380 }
378 381
379 } } // namespace v8::internal 382 } } // namespace v8::internal
380 383
381 #endif // V8_SPACES_INL_H_ 384 #endif // V8_SPACES_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