Merge isolates to bleeding_edge.

src/virtual-frame-light-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 65 matching lines @@
 void VirtualFrame::PrepareForReturn() {
   // Don't bother flushing tos registers as returning does not require more
   // access to the expression stack.
   top_of_stack_state_ = NO_TOS_REGISTERS;
 }
 
 
 VirtualFrame::RegisterAllocationScope::RegisterAllocationScope(
     CodeGenerator* cgen)
   : cgen_(cgen),
-    old_is_spilled_(SpilledScope::is_spilled_) {
-  SpilledScope::is_spilled_ = false;
+    old_is_spilled_(
+        Isolate::Current()->is_virtual_frame_in_spilled_scope()) {
+  Isolate::Current()->set_is_virtual_frame_in_spilled_scope(false);
   if (old_is_spilled_) {
     VirtualFrame* frame = cgen->frame();
     if (frame != NULL) {
       frame->AssertIsSpilled();
     }
   }
 }
 
 
 VirtualFrame::RegisterAllocationScope::~RegisterAllocationScope() {
-  SpilledScope::is_spilled_ = old_is_spilled_;
+  Isolate::Current()->set_is_virtual_frame_in_spilled_scope(old_is_spilled_);
   if (old_is_spilled_) {
     VirtualFrame* frame = cgen_->frame();
     if (frame != NULL) {
       frame->SpillAll();
     }
   }
 }
 
 
 CodeGenerator* VirtualFrame::cgen() const {
-  return CodeGeneratorScope::Current();
+  return CodeGeneratorScope::Current(Isolate::Current());
 }
 
 
 MacroAssembler* VirtualFrame::masm() { return cgen()->masm(); }
 
 
 void VirtualFrame::CallStub(CodeStub* stub, int arg_count) {
   if (arg_count != 0) Forget(arg_count);
   ASSERT(cgen()->HasValidEntryRegisters());
   masm()->CallStub(stub);
@@ skipping 41 matching lines @@
 
 MemOperand VirtualFrame::LocalAt(int index) {
   ASSERT(0 <= index);
   ASSERT(index < local_count());
   return MemOperand(fp, kLocal0Offset - index * kPointerSize);
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_VIRTUAL_FRAME_LIGHT_INL_H_