Index: runtime/vm/dart_api_impl.cc |
diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc |
index 1400d12c093615a09a15ea4494aac94cece0ee06..f0521085318c1376d09c3dee8147925abbef663c 100644 |
--- a/runtime/vm/dart_api_impl.cc |
+++ b/runtime/vm/dart_api_impl.cc |
@@ -200,7 +200,7 @@ Dart_Handle Api::NewError(const char* format, ...) { |
intptr_t len = OS::VSNPrint(NULL, 0, format, args); |
va_end(args); |
- char* buffer = zone.Alloc<char>(len + 1); |
+ char* buffer = zone.GetZone()->Alloc<char>(len + 1); |
siva
2012/10/12 20:40:21
This would be isolate->current_zone()->Alloc ?
Tom Ball
2012/10/12 22:56:51
Done.
|
va_list args2; |
va_start(args2, format); |
OS::VSNPrint(buffer, (len + 1), format, args2); |
@@ -410,7 +410,7 @@ DART_EXPORT Dart_Handle Dart_Error(const char* format, ...) { |
intptr_t len = OS::VSNPrint(NULL, 0, format, args); |
va_end(args); |
- char* buffer = zone.Alloc<char>(len + 1); |
+ char* buffer = isolate->current_zone()->Alloc<char>(len + 1); |
va_list args2; |
va_start(args2, format); |
OS::VSNPrint(buffer, (len + 1), format, args2); |
@@ -432,7 +432,7 @@ DART_EXPORT Dart_Handle Dart_NewApiError(const char* format, ...) { |
intptr_t len = OS::VSNPrint(NULL, 0, format, args); |
va_end(args); |
- char* buffer = zone.Alloc<char>(len + 1); |
+ char* buffer = isolate->current_zone()->Alloc<char>(len + 1); |
va_list args2; |
va_start(args2, format); |
OS::VSNPrint(buffer, (len + 1), format, args2); |
@@ -457,7 +457,7 @@ DART_EXPORT Dart_Handle Dart_NewUnhandledExceptionError(Dart_Handle exception) { |
DART_EXPORT Dart_Handle Dart_PropagateError(Dart_Handle handle) { |
Isolate* isolate = Isolate::Current(); |
- CHECK_ISOLATE(isolate); |
+ DARTSCOPE(isolate); |
const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(handle)); |
if (!obj.IsError()) { |
return Api::NewError( |
@@ -1142,7 +1142,7 @@ DART_EXPORT void Dart_ExitScope() { |
DART_EXPORT uint8_t* Dart_ScopeAllocate(intptr_t size) { |
- ApiZone* zone; |
+ Zone* zone; |
Isolate* isolate = Isolate::Current(); |
if (isolate != NULL) { |
ApiState* state = isolate->api_state(); |
@@ -4422,7 +4422,7 @@ DART_EXPORT void Dart_GetPprofSymbolInfo(void** buffer, int* buffer_size) { |
pprof_symbol_generator->WriteToMemory(debug_region); |
*buffer_size = debug_region->size(); |
if (*buffer_size != 0) { |
- ApiZone* zone = Api::TopScope(isolate)->zone(); |
+ Zone* zone = Api::TopScope(isolate)->zone(); |
*buffer = reinterpret_cast<void*>(zone->AllocUnsafe(*buffer_size)); |
memmove(*buffer, debug_region->data(), *buffer_size); |
} else { |