Merge isolates to bleeding_edge.

src/full-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 59 matching lines @@
 // Full code generator.
 
 class FullCodeGenerator: public AstVisitor {
  public:
   enum State {
     NO_REGISTERS,
     TOS_REG
   };
 
   explicit FullCodeGenerator(MacroAssembler* masm)
-      : masm_(masm),
+      : isolate_(Isolate::Current()),
+        masm_(masm),
         info_(NULL),
         nesting_stack_(NULL),
         loop_depth_(0),
         context_(NULL),
         bailout_entries_(0),
         stack_checks_(2),  // There's always at least one.
         forward_bailout_stack_(NULL),
         forward_bailout_pending_(NULL) {
   }
 
@@ skipping 395 matching lines @@
   void ExitFinallyBlock();
 
   // Loop nesting counter.
   int loop_depth() { return loop_depth_; }
   void increment_loop_depth() { loop_depth_++; }
   void decrement_loop_depth() {
     ASSERT(loop_depth_ > 0);
     loop_depth_--;
   }
 
+  Isolate* isolate() { return isolate_; }
   MacroAssembler* masm() { return masm_; }
 
   class ExpressionContext;
   const ExpressionContext* context() { return context_; }
   void set_new_context(const ExpressionContext* context) { context_ = context; }
 
   Handle<Script> script() { return info_->script(); }
   bool is_eval() { return info_->is_eval(); }
   bool is_strict_mode() { return function()->strict_mode(); }
   StrictModeFlag strict_mode_flag() {
@@ skipping 40 matching lines @@
    public:
     explicit ExpressionContext(FullCodeGenerator* codegen)
         : masm_(codegen->masm()), old_(codegen->context()), codegen_(codegen) {
       codegen->set_new_context(this);
     }
 
     virtual ~ExpressionContext() {
       codegen_->set_new_context(old_);
     }
 
+    Isolate* isolate() const { return codegen_->isolate(); }
+
     // Convert constant control flow (true or false) to the result expected for
     // this expression context.
     virtual void Plug(bool flag) const = 0;
 
     // Emit code to convert a pure value (in a register, slot, as a literal,
     // or on top of the stack) into the result expected according to this
     // expression context.
     virtual void Plug(Register reg) const = 0;
     virtual void Plug(Slot* slot) const = 0;
     virtual void Plug(Handle<Object> lit) const = 0;
@@ skipping 156 matching lines @@
                                  Label* done) const;
     virtual void PrepareTest(Label* materialize_true,
                              Label* materialize_false,
                              Label** if_true,
                              Label** if_false,
                              Label** fall_through) const;
     virtual void HandleExpression(Expression* expr) const;
     virtual bool IsEffect() const { return true; }
   };
 
+  Isolate* isolate_;
   MacroAssembler* masm_;
   CompilationInfo* info_;
   Label return_label_;
   NestedStatement* nesting_stack_;
   int loop_depth_;
   const ExpressionContext* context_;
   ZoneList<BailoutEntry> bailout_entries_;
   ZoneList<BailoutEntry> stack_checks_;
   ForwardBailoutStack* forward_bailout_stack_;
   ForwardBailoutStack* forward_bailout_pending_;
 
   friend class NestedStatement;
 
   DISALLOW_COPY_AND_ASSIGN(FullCodeGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FULL_CODEGEN_H_