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

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

Issue 11316: Merged bleeding edge 746:795 into regexp2000. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/regexp2000/
Patch Set: Created 12 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 | « src/heap.cc ('k') | src/ic.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 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 20 matching lines...) Expand all
31 #include "log.h" 31 #include "log.h"
32 #include "v8-counters.h" 32 #include "v8-counters.h"
33 33
34 namespace v8 { namespace internal { 34 namespace v8 { namespace internal {
35 35
36 int Heap::MaxHeapObjectSize() { 36 int Heap::MaxHeapObjectSize() {
37 return Page::kMaxHeapObjectSize; 37 return Page::kMaxHeapObjectSize;
38 } 38 }
39 39
40 40
41 Object* Heap::AllocateSymbol(Vector<const char> str,
42 int chars,
43 uint32_t length_field) {
44 if (global_external_symbol_callback_) {
45 return AllocateExternalSymbol(str, chars);
46 }
47 unibrow::Utf8InputBuffer<> buffer(str.start(),
48 static_cast<unsigned>(str.length()));
49 return AllocateInternalSymbol(&buffer, chars, length_field);
50 }
51
52
41 Object* Heap::AllocateRaw(int size_in_bytes, 53 Object* Heap::AllocateRaw(int size_in_bytes,
42 AllocationSpace space, 54 AllocationSpace space,
43 AllocationSpace retry_space) { 55 AllocationSpace retry_space) {
44 ASSERT(allocation_allowed_ && gc_state_ == NOT_IN_GC); 56 ASSERT(allocation_allowed_ && gc_state_ == NOT_IN_GC);
45 ASSERT(space != NEW_SPACE || 57 ASSERT(space != NEW_SPACE ||
46 retry_space == OLD_POINTER_SPACE || 58 retry_space == OLD_POINTER_SPACE ||
47 retry_space == OLD_DATA_SPACE); 59 retry_space == OLD_DATA_SPACE);
48 #ifdef DEBUG 60 #ifdef DEBUG
49 if (FLAG_gc_interval >= 0 && 61 if (FLAG_gc_interval >= 0 &&
50 !disallow_allocation_failure_ && 62 !disallow_allocation_failure_ &&
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 allocation_allowed_ = new_state; 275 allocation_allowed_ = new_state;
264 return old; 276 return old;
265 } 277 }
266 278
267 #endif 279 #endif
268 280
269 281
270 } } // namespace v8::internal 282 } } // namespace v8::internal
271 283
272 #endif // V8_HEAP_INL_H_ 284 #endif // V8_HEAP_INL_H_
OLDNEW
« no previous file with comments | « src/heap.cc ('k') | src/ic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698