| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, 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 #ifndef VM_ALLOCATION_H_ | 5 #ifndef VM_ALLOCATION_H_ |
| 6 #define VM_ALLOCATION_H_ | 6 #define VM_ALLOCATION_H_ |
| 7 | 7 |
| 8 #include "platform/assert.h" | 8 #include "platform/assert.h" |
| 9 #include "vm/base_isolate.h" | 9 #include "vm/base_isolate.h" |
| 10 #include "vm/globals.h" | 10 #include "vm/globals.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 class ZoneAllocated { | 89 class ZoneAllocated { |
| 90 public: | 90 public: |
| 91 ZoneAllocated() { } | 91 ZoneAllocated() { } |
| 92 // It would be ideal if the destructor method could be made private, | 92 // It would be ideal if the destructor method could be made private, |
| 93 // but the g++ compiler complains when this is subclassed. | 93 // but the g++ compiler complains when this is subclassed. |
| 94 virtual ~ZoneAllocated(); | 94 virtual ~ZoneAllocated(); |
| 95 | 95 |
| 96 // Implicitly allocate the object in the current zone. | 96 // Implicitly allocate the object in the current zone. |
| 97 void* operator new(uword size); | 97 void* operator new(uword size); |
| 98 | 98 |
| 99 // Implicitly allocate the object in the current zone given the current |
| 100 // isolate. |
| 101 void* operator new(uword size, BaseIsolate* isolate); |
| 102 |
| 99 // Ideally, the delete operator should be protected instead of | 103 // Ideally, the delete operator should be protected instead of |
| 100 // public, but unfortunately the compiler sometimes synthesizes | 104 // public, but unfortunately the compiler sometimes synthesizes |
| 101 // (unused) destructors for classes derived from ZoneObject, which | 105 // (unused) destructors for classes derived from ZoneObject, which |
| 102 // require the operator to be visible. MSVC requires the delete | 106 // require the operator to be visible. MSVC requires the delete |
| 103 // operator to be public. | 107 // operator to be public. |
| 104 | 108 |
| 105 // Disallow explicit deallocation of nodes. Nodes can only be | 109 // Disallow explicit deallocation of nodes. Nodes can only be |
| 106 // deallocated by invoking DeleteAll() on the zone they live in. | 110 // deallocated by invoking DeleteAll() on the zone they live in. |
| 107 void operator delete(void* pointer) { UNREACHABLE(); } | 111 void operator delete(void* pointer) { UNREACHABLE(); } |
| 108 | 112 |
| 109 private: | 113 private: |
| 110 DISALLOW_COPY_AND_ASSIGN(ZoneAllocated); | 114 DISALLOW_COPY_AND_ASSIGN(ZoneAllocated); |
| 111 }; | 115 }; |
| 112 | 116 |
| 113 } // namespace dart | 117 } // namespace dart |
| 114 | 118 |
| 115 #endif // VM_ALLOCATION_H_ | 119 #endif // VM_ALLOCATION_H_ |
| OLD | NEW |