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 StackResource::StackResource(Isolate* isolate) : isolate_(isolate) { | 13 StackResource::StackResource(Isolate* isolate) |
14 previous_ = isolate->top_resource(); | 14 : isolate_(isolate), previous_(NULL) { |
15 isolate->set_top_resource(this); | 15 // We can only have longjumps and exceptions when there is a current |
| 16 // isolate. If there is no current isolate, we don't need to |
| 17 // protect this case. |
| 18 if (isolate) { |
| 19 previous_ = isolate->top_resource(); |
| 20 isolate->set_top_resource(this); |
| 21 } |
16 } | 22 } |
17 | 23 |
18 | 24 |
19 StackResource::~StackResource() { | 25 StackResource::~StackResource() { |
20 StackResource* top = isolate()->top_resource(); | 26 if (isolate()) { |
21 ASSERT(top == this); | 27 StackResource* top = isolate()->top_resource(); |
22 isolate()->set_top_resource(previous_); | 28 ASSERT(top == this); |
| 29 isolate()->set_top_resource(previous_); |
| 30 } |
| 31 ASSERT(Isolate::Current() == isolate()); |
23 } | 32 } |
24 | 33 |
25 ZoneAllocated::~ZoneAllocated() { | 34 ZoneAllocated::~ZoneAllocated() { |
26 UNREACHABLE(); | 35 UNREACHABLE(); |
27 } | 36 } |
28 | 37 |
29 void* ZoneAllocated::operator new(uword size) { | 38 void* ZoneAllocated::operator new(uword size) { |
30 Isolate* isolate = Isolate::Current(); | 39 Isolate* isolate = Isolate::Current(); |
31 ASSERT(isolate != NULL); | 40 ASSERT(isolate != NULL); |
32 ASSERT(isolate->current_zone() != NULL); | 41 ASSERT(isolate->current_zone() != NULL); |
33 return reinterpret_cast<void*>(isolate->current_zone()->Allocate(size)); | 42 return reinterpret_cast<void*>(isolate->current_zone()->Allocate(size)); |
34 } | 43 } |
35 | 44 |
36 } // namespace dart | 45 } // namespace dart |
OLD | NEW |