| Index: runtime/vm/service_isolate.cc | 
| diff --git a/runtime/vm/service_isolate.cc b/runtime/vm/service_isolate.cc | 
| index ad6be9d1d98b97cfb88d017e7ad28ca781a6917b..9ff38ef9cc19714c08278a4c450ce213aee49e17 100644 | 
| --- a/runtime/vm/service_isolate.cc | 
| +++ b/runtime/vm/service_isolate.cc | 
| @@ -219,7 +219,7 @@ class ServiceIsolateNatives : public AllStatic { | 
| public: | 
| static void SendIsolateServiceMessage(Dart_NativeArguments args) { | 
| NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args); | 
| -    Isolate* isolate = arguments->isolate(); | 
| +    Isolate* isolate = arguments->thread()->isolate(); | 
| StackZone stack_zone(isolate); | 
| Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT. | 
| HANDLESCOPE(isolate); | 
| @@ -243,7 +243,7 @@ class ServiceIsolateNatives : public AllStatic { | 
|  | 
| static void SendRootServiceMessage(Dart_NativeArguments args) { | 
| NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args); | 
| -    Isolate* isolate = arguments->isolate(); | 
| +    Isolate* isolate = arguments->thread()->isolate(); | 
| StackZone stack_zone(isolate); | 
| Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT. | 
| HANDLESCOPE(isolate); | 
| @@ -253,7 +253,7 @@ class ServiceIsolateNatives : public AllStatic { | 
|  | 
| static void OnStart(Dart_NativeArguments args) { | 
| NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args); | 
| -    Isolate* isolate = arguments->isolate(); | 
| +    Isolate* isolate = arguments->thread()->isolate(); | 
| StackZone zone(isolate); | 
| HANDLESCOPE(isolate); | 
| { | 
| @@ -287,7 +287,7 @@ class ServiceIsolateNatives : public AllStatic { | 
|  | 
| static void OnExit(Dart_NativeArguments args) { | 
| NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args); | 
| -    Isolate* isolate = arguments->isolate(); | 
| +    Isolate* isolate = arguments->thread()->isolate(); | 
| StackZone zone(isolate); | 
| HANDLESCOPE(isolate); | 
| { | 
| @@ -299,7 +299,7 @@ class ServiceIsolateNatives : public AllStatic { | 
|  | 
| static void ListenStream(Dart_NativeArguments args) { | 
| NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args); | 
| -    Isolate* isolate = arguments->isolate(); | 
| +    Isolate* isolate = arguments->thread()->isolate(); | 
| StackZone stack_zone(isolate); | 
| Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT. | 
| HANDLESCOPE(isolate); | 
| @@ -309,7 +309,7 @@ class ServiceIsolateNatives : public AllStatic { | 
|  | 
| static void CancelStream(Dart_NativeArguments args) { | 
| NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args); | 
| -    Isolate* isolate = arguments->isolate(); | 
| +    Isolate* isolate = arguments->thread()->isolate(); | 
| StackZone stack_zone(isolate); | 
| Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT. | 
| HANDLESCOPE(isolate); | 
|  |