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

runtime/vm/dart.cc

 // Copyright (c) 2013, 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/dart.h"
 
 #include "vm/code_observers.h"
 #include "vm/cpu.h"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
@@ skipping 95 matching lines @@
 #if defined(USING_SIMULATOR)
   Simulator::InitOnce();
 #endif
   // Create the read-only handles area.
   ASSERT(predefined_handles_ == NULL);
   predefined_handles_ = new ReadOnlyHandles();
   // Create the VM isolate and finish the VM initialization.
   ASSERT(thread_pool_ == NULL);
   thread_pool_ = new ThreadPool();
   {
+    Thread* thread = Thread::Current();
+    ASSERT(thread != NULL);
     ASSERT(vm_isolate_ == NULL);
     ASSERT(Flags::Initialized());
     const bool is_vm_isolate = true;
 
     // Setup default flags for the VM isolate.
     Isolate::Flags vm_flags;
     Dart_IsolateFlags api_flags;
     vm_flags.CopyTo(&api_flags);
     vm_isolate_ = Isolate::Init("vm-isolate", api_flags, is_vm_isolate);
+    // Verify assumptions about executing in the VM isolate.
+    ASSERT(vm_isolate_ == Isolate::Current());
+    ASSERT(vm_isolate_ == Thread::Current()->isolate());
 
     StackZone zone(vm_isolate_);
-    HandleScope handle_scope(vm_isolate_);
+    HandleScope handle_scope(thread);
     Object::InitNull(vm_isolate_);
     ObjectStore::Init(vm_isolate_);
     TargetCPUFeatures::InitOnce();
     Object::InitOnce(vm_isolate_);
     ArgumentsDescriptor::InitOnce();
     StubCode::InitOnce();
     Thread::InitOnceAfterObjectAndStubCode();
     // Now that the needed stub has been generated, set the stack limit.
     vm_isolate_->InitializeStackLimit();
     if (vm_isolate_snapshot != NULL) {
       const Snapshot* snapshot = Snapshot::SetupFromBuffer(vm_isolate_snapshot);
       if (snapshot == NULL) {
         return "Invalid vm isolate snapshot seen.";
       }
       ASSERT(snapshot->kind() == Snapshot::kFull);
       VmIsolateSnapshotReader reader(snapshot->content(),
                                      snapshot->length(),
-                                     zone.GetZone());
+                                     thread);
       const Error& error = Error::Handle(reader.ReadVmIsolateSnapshot());
       if (!error.IsNull()) {
         return error.ToCString();
       }
       if (FLAG_trace_isolates) {
         OS::Print("Size of vm isolate snapshot = %" Pd "\n",
                   snapshot->length());
         vm_isolate_->heap()->PrintSizes();
         vm_isolate_->megamorphic_cache_table()->PrintSizes();
         intptr_t size;
@@ skipping 88 matching lines @@
   Isolate* isolate = thread->isolate();
   TIMERSCOPE(thread, time_isolate_initialization);
   TimelineDurationScope tds(isolate,
                             isolate->GetIsolateStream(),
                             "InitializeIsolate");
   tds.SetNumArguments(1);
   tds.CopyArgument(0, "isolateName", isolate->name());
 
   ASSERT(isolate != NULL);
   StackZone zone(isolate);
-  HandleScope handle_scope(isolate);
+  HandleScope handle_scope(thread);
   {
     TimelineDurationScope tds(isolate,
                               isolate->GetIsolateStream(),
                               "ObjectStore::Init");
     ObjectStore::Init(isolate);
   }
 
   // Setup for profiling.
   Profiler::InitProfilingForIsolate(isolate);
 
@@ skipping 12 matching lines @@
       const String& message = String::Handle(
           String::New("Invalid snapshot."));
       return ApiError::New(message);
     }
     ASSERT(snapshot->kind() == Snapshot::kFull);
     if (FLAG_trace_isolates) {
       OS::Print("Size of isolate snapshot = %" Pd "\n", snapshot->length());
     }
     IsolateSnapshotReader reader(snapshot->content(),
                                  snapshot->length(),
-                                 isolate,
-                                 zone.GetZone());
+                                 thread);
     const Error& error = Error::Handle(reader.ReadFullSnapshot());
     if (!error.IsNull()) {
       return error.raw();
     }
     if (FLAG_trace_isolates) {
       isolate->heap()->PrintSizes();
       isolate->megamorphic_cache_table()->PrintSizes();
     }
   } else {
     // Populate the isolate's symbol table with all symbols from the
@@ skipping 83 matching lines @@
   return predefined_handles_->handles_.IsValidScopedHandle(address);
 }
 
 
 bool Dart::IsReadOnlyApiHandle(Dart_Handle handle) {
   ASSERT(predefined_handles_ != NULL);
   return predefined_handles_->api_handles_.IsValidHandle(handle);
 }
 
 }  // namespace dart