| Index: runtime/bin/vmservice_dartium.cc
|
| diff --git a/runtime/bin/vmservice_dartium.cc b/runtime/bin/vmservice_dartium.cc
|
| index cd2c87fb7b1c9f8642e105c46b8e3cfca9ca114e..6ff907c5397463bddda1fcf91f99f9a0a6a91d08 100644
|
| --- a/runtime/bin/vmservice_dartium.cc
|
| +++ b/runtime/bin/vmservice_dartium.cc
|
| @@ -43,12 +43,15 @@ void VmServiceServer::Bootstrap() {
|
| Dart_Isolate VmServiceServer::CreateIsolate(const uint8_t* snapshot_buffer) {
|
| ASSERT(snapshot_buffer != NULL);
|
| // Create the isolate.
|
| + IsolateData* isolate_data = new IsolateData(DART_VM_SERVICE_ISOLATE_NAME,
|
| + NULL,
|
| + NULL);
|
| char* error = 0;
|
| Dart_Isolate isolate = Dart_CreateIsolate(DART_VM_SERVICE_ISOLATE_NAME,
|
| "main",
|
| snapshot_buffer,
|
| NULL,
|
| - NULL,
|
| + isolate_data,
|
| &error);
|
| if (!isolate) {
|
| fprintf(stderr, "Dart_CreateIsolate failed: %s\n", error);
|
| @@ -59,16 +62,11 @@ Dart_Isolate VmServiceServer::CreateIsolate(const uint8_t* snapshot_buffer) {
|
| Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
|
| Builtin::SetNativeResolver(Builtin::kIOLibrary);
|
|
|
| - Dart_Handle builtin_lib =
|
| - Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
|
| - CHECK_RESULT(builtin_lib);
|
| -
|
| Dart_Handle result;
|
|
|
| // Prepare for script loading by setting up the 'print' and 'timer'
|
| // closures and setting up 'package root' for URI resolution.
|
| - result = DartUtils::PrepareForScriptLoading(
|
| - NULL, NULL, true, false, builtin_lib);
|
| + result = DartUtils::PrepareForScriptLoading(true, false);
|
| CHECK_RESULT(result);
|
|
|
| ASSERT(Dart_IsServiceIsolate(isolate));
|
|
|