| Index: runtime/vm/bootstrap.cc | 
| diff --git a/runtime/vm/bootstrap.cc b/runtime/vm/bootstrap.cc | 
| index a9b94853c9fb58dccdf4b9b0228dd585c4d3c084..912aa1f36bc69fbe3d9050c1f5d9a2a69ea335d7 100644 | 
| --- a/runtime/vm/bootstrap.cc | 
| +++ b/runtime/vm/bootstrap.cc | 
| @@ -253,7 +253,8 @@ static RawError* LoadPatchFiles(Isolate* isolate, | 
|  | 
|  | 
| RawError* Bootstrap::LoadandCompileScripts() { | 
| -  Isolate* isolate = Isolate::Current(); | 
| +  Thread* thread = Thread::Current(); | 
| +  Isolate* isolate = thread->isolate(); | 
| String& uri = String::Handle(isolate); | 
| String& patch_uri = String::Handle(isolate); | 
| String& source = String::Handle(isolate); | 
| @@ -266,7 +267,7 @@ RawError* Bootstrap::LoadandCompileScripts() { | 
| // library tag handler so that we can load all the bootstrap libraries. | 
| isolate->set_library_tag_handler(BootstrapLibraryTagHandler); | 
|  | 
| -  HANDLESCOPE(isolate); | 
| +  HANDLESCOPE(thread); | 
|  | 
| // Create library objects for all the bootstrap libraries. | 
| for (intptr_t i = 0; | 
|  |