- Ensure that HandleScope is initialized with a thread. (Remove

runtime/vm/bootstrap.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/bootstrap.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
@@ skipping 235 matching lines @@
     error = lib.Patch(script);
     if (!error.IsNull()) {
       return error.raw();
     }
   }
   return Error::null();
 }
 
 
 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);
   Script& script = Script::Handle(isolate);
   Library& lib = Library::Handle(isolate);
   Error& error = Error::Handle(isolate);
   Dart_LibraryTagHandler saved_tag_handler = isolate->library_tag_handler();
 
   // Set the library tag handler for the isolate to the bootstrap
   // 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;
        bootstrap_libraries[i].index_ != ObjectStore::kNone;
        ++i) {
     uri = Symbols::New(bootstrap_libraries[i].uri_);
     lib = Library::LookupLibrary(uri);
     if (lib.IsNull()) {
       lib = Library::NewLibraryHelper(uri, false);
       lib.SetLoadRequested();
@@ skipping 49 matching lines @@
     Compiler::CompileClass(cls);
   }
 
   // Restore the library tag handler for the isolate.
   isolate->set_library_tag_handler(saved_tag_handler);
 
   return error.raw();
 }
 
 }  // namespace dart