OLD | NEW |
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/allocation.h" | 5 #include "vm/allocation.h" |
6 | 6 |
7 #include "platform/assert.h" | 7 #include "platform/assert.h" |
8 #include "vm/isolate.h" | 8 #include "vm/isolate.h" |
9 #include "vm/zone.h" | 9 #include "vm/zone.h" |
10 | 10 |
11 namespace dart { | 11 namespace dart { |
12 | 12 |
13 static void* Allocate(uword size, BaseIsolate* isolate) { | 13 static void* Allocate(uword size, Zone* zone) { |
14 ASSERT(isolate != NULL); | 14 ASSERT(zone != NULL); |
15 ASSERT(isolate->current_zone() != NULL); | |
16 if (size > static_cast<uword>(kIntptrMax)) { | 15 if (size > static_cast<uword>(kIntptrMax)) { |
17 FATAL1("ZoneAllocated object has unexpectedly large size %" Pu "", size); | 16 FATAL1("ZoneAllocated object has unexpectedly large size %" Pu "", size); |
18 } | 17 } |
19 return reinterpret_cast<void*>(isolate->current_zone()->AllocUnsafe(size)); | 18 return reinterpret_cast<void*>(zone->AllocUnsafe(size)); |
20 } | 19 } |
21 | 20 |
22 | 21 |
23 void* ZoneAllocated::operator new(uword size) { | 22 void* ZoneAllocated::operator new(uword size) { |
24 return Allocate(size, Isolate::Current()); | 23 return Allocate(size, Isolate::Current()->current_zone()); |
25 } | 24 } |
26 | 25 |
27 | 26 |
28 void* ZoneAllocated::operator new(uword size, BaseIsolate* isolate) { | 27 void* ZoneAllocated::operator new(uword size, BaseIsolate* isolate) { |
29 return Allocate(size, isolate); | 28 ASSERT(isolate != NULL); |
| 29 return Allocate(size, isolate->current_zone()); |
| 30 } |
| 31 |
| 32 |
| 33 void* ZoneAllocated::operator new(uword size, Zone* zone) { |
| 34 ASSERT(zone == Isolate::Current()->current_zone()); |
| 35 return Allocate(size, zone); |
30 } | 36 } |
31 | 37 |
32 } // namespace dart | 38 } // namespace dart |
OLD | NEW |