[Isolates] Moved more compilation-related globals (builtins, runtime, &c.)...

src/vm-state-inl.h

 // Copyright 2010 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 40 matching lines @@
       return "OTHER";
     default:
       UNREACHABLE();
       return NULL;
   }
 }
 
 VMState::VMState(StateTag state)
     : disabled_(true),
       state_(OTHER),
-      external_callback_(NULL) {
+      external_callback_(NULL),
+      isolate_(Isolate::Current()) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (!LOGGER->is_logging() && !CpuProfiler::is_profiling()) {
     return;
   }
 #endif
 
   disabled_ = false;
 #if !defined(ENABLE_HEAP_PROTECTION)
   // When not protecting the heap, there is no difference between
   // EXTERNAL and OTHER.  As an optimization in that case, we will not
   // perform EXTERNAL->OTHER transitions through the API.  We thus
   // compress the two states into one.
   if (state == EXTERNAL) state = OTHER;
 #endif
   state_ = state;
-  previous_ = current_state_;  // Save the previous state.
-  current_state_ = this;       // Install the new state.
+  previous_ = isolate_->vm_state();   // Save the previous state.
+  isolate_->set_vm_state(this);       // Install the new state.
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (FLAG_log_state_changes) {
     LOG(UncheckedStringEvent("Entering", StateToString(state_)));
     if (previous_ != NULL) {
       LOG(UncheckedStringEvent("From", StateToString(previous_->state_)));
     }
   }
 #endif
 
 #ifdef ENABLE_HEAP_PROTECTION
   if (FLAG_protect_heap) {
     if (state_ == EXTERNAL) {
       // We are leaving V8.
       ASSERT((previous_ != NULL) && (previous_->state_ != EXTERNAL));
       Heap::Protect();
     } else if ((previous_ == NULL) || (previous_->state_ == EXTERNAL)) {
       // We are entering V8.
       Heap::Unprotect();
     }
   }
 #endif
 }
 
 
 VMState::~VMState() {
+  ASSERT(isolate_ == Isolate::Current());
   if (disabled_) return;
-  current_state_ = previous_;  // Return to the previous state.
+  isolate_->set_vm_state(previous_);  // Return to the previous state.
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (FLAG_log_state_changes) {
     LOG(UncheckedStringEvent("Leaving", StateToString(state_)));
     if (previous_ != NULL) {
       LOG(UncheckedStringEvent("To", StateToString(previous_->state_)));
     }
   }
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 #ifdef ENABLE_HEAP_PROTECTION
   if (FLAG_protect_heap) {
     if (state_ == EXTERNAL) {
       // We are reentering V8.
       ASSERT((previous_ != NULL) && (previous_->state_ != EXTERNAL));
       Heap::Unprotect();
     } else if ((previous_ == NULL) || (previous_->state_ == EXTERNAL)) {
       // We are leaving V8.
       Heap::Protect();
     }
   }
 #endif  // ENABLE_HEAP_PROTECTION
 }
 #endif  // ENABLE_VMSTATE_TRACKING
 
 } }  // namespace v8::internal
 
 #endif  // V8_VM_STATE_INL_H_