Merge isolates to bleeding_edge.

src/codegen.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 74 matching lines @@
 
 #include "register-allocator.h"
 
 namespace v8 {
 namespace internal {
 
 // Code generation can be nested.  Code generation scopes form a stack
 // of active code generators.
 class CodeGeneratorScope BASE_EMBEDDED {
  public:
-  explicit CodeGeneratorScope(CodeGenerator* cgen) {
-    previous_ = top_;
-    top_ = cgen;
+  explicit CodeGeneratorScope(Isolate* isolate, CodeGenerator* cgen)
+      : isolate_(isolate) {
+    previous_ = isolate->current_code_generator();
+    isolate->set_current_code_generator(cgen);
   }
 
   ~CodeGeneratorScope() {
-    top_ = previous_;
+    isolate_->set_current_code_generator(previous_);
   }
 
-  static CodeGenerator* Current() {
-    ASSERT(top_ != NULL);
-    return top_;
+  static CodeGenerator* Current(Isolate* isolate) {
+    ASSERT(isolate->current_code_generator() != NULL);
+    return isolate->current_code_generator();
   }
 
  private:
-  static CodeGenerator* top_;
   CodeGenerator* previous_;
+  Isolate* isolate_;
 };
 
-
 #if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64
 
 // State of used registers in a virtual frame.
 class FrameRegisterState {
  public:
   // Captures the current state of the given frame.
   explicit FrameRegisterState(VirtualFrame* frame);
 
   // Saves the state in the stack.
   void Save(MacroAssembler* masm) const;
@@ skipping 111 matching lines @@
 #ifdef DEBUG
   const char* comment_;
 #endif
   DISALLOW_COPY_AND_ASSIGN(DeferredCode);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODEGEN_H_