Fix multiple V8::Dispose calls since r16563.

src/v8.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 45 matching lines @@
 static LazyMutex entropy_mutex = LAZY_MUTEX_INITIALIZER;
 
 static EntropySource entropy_source;
 
 
 bool V8::Initialize(Deserializer* des) {
   InitializeOncePerProcess();
 
   // The current thread may not yet had entered an isolate to run.
   // Note the Isolate::Current() may be non-null because for various
-  // initialization purposes an initializing thread may be assigned an isolate
-  // but not actually enter it.
+  // initialization purposes an initializing thread may be assigned an
+  // isolate but not actually enter it.
   if (i::Isolate::CurrentPerIsolateThreadData() == NULL) {
     i::Isolate::EnterDefaultIsolate();
   }
 
   ASSERT(i::Isolate::CurrentPerIsolateThreadData() != NULL);
   ASSERT(i::Isolate::CurrentPerIsolateThreadData()->thread_id().Equals(
            i::ThreadId::Current()));
   ASSERT(i::Isolate::CurrentPerIsolateThreadData()->isolate() ==
          i::Isolate::Current());
 
   Isolate* isolate = Isolate::Current();
   if (isolate->IsDead()) return false;
   if (isolate->IsInitialized()) return true;
 
   return isolate->Init(des);
 }
 
 
 void V8::TearDown() {
+  // The current thread may not yet had entered an isolate to run or may
+  // have already disposed the entered isolated before.
+  // Note the Isolate::Current() may be non-null because for various
+  // initialization purposes an initializing thread may be assigned an
+  // isolate but not actually enter it.
+  if (i::Isolate::CurrentPerIsolateThreadData() == NULL) {
+    return;
+  }
+
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate->IsDefaultIsolate());
   if (!isolate->IsInitialized()) return;
 
   // The isolate has to be torn down before clearing the LOperand
   // caches so that the optimizing compiler thread (if running)
   // doesn't see an inconsistent view of the lithium instructions.
+  Isolate::SetIsolateThreadLocals(isolate, NULL);

[Sven Panne, 2013/09/06 10:48:27]

This looks a bit strange, but to be honest, I don't have a clue if/how/where we
deallocate the TLS data, so this might be OK.

   isolate->TearDown();
   delete isolate;
 
   ElementsAccessor::TearDown();
   LOperand::TearDownCaches();
   ExternalReference::TearDownMathExpData();
   RegisteredExtension::UnregisterAll();
   Isolate::GlobalTearDown();
 
   delete call_completed_callbacks_;
@@ skipping 188 matching lines @@
   ExternalReference::SetUp();
   Bootstrapper::InitializeOncePerProcess();
 }
 
 
 void V8::InitializeOncePerProcess() {
   CallOnce(&init_once, &InitializeOncePerProcessImpl);
 }
 
 } }  // namespace v8::internal