Merge isolates to bleeding_edge.

src/jump-target-heavy.cc

 // 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 17 matching lines @@
 #include "v8.h"
 
 #include "codegen-inl.h"
 #include "jump-target-inl.h"
 #include "register-allocator-inl.h"
 
 namespace v8 {
 namespace internal {
 
 
-bool JumpTarget::compiling_deferred_code_ = false;
-
-
 void JumpTarget::Jump(Result* arg) {
   ASSERT(cgen()->has_valid_frame());
 
   cgen()->frame()->Push(arg);
   DoJump();
 }
 
 
 void JumpTarget::Branch(Condition cc, Result* arg, Hint hint) {
   ASSERT(cgen()->has_valid_frame());
@@ skipping 85 matching lines @@
   *arg1 = cgen()->frame()->Pop();
   *arg0 = cgen()->frame()->Pop();
 }
 
 
 void JumpTarget::ComputeEntryFrame() {
   // Given: a collection of frames reaching by forward CFG edges and
   // the directionality of the block.  Compute: an entry frame for the
   // block.
 
-  Counters::compute_entry_frame.Increment();
+  COUNTERS->compute_entry_frame()->Increment();
 #ifdef DEBUG
-  if (compiling_deferred_code_) {
+  if (Isolate::Current()->jump_target_compiling_deferred_code()) {
     ASSERT(reaching_frames_.length() > 1);
     VirtualFrame* frame = reaching_frames_[0];
     bool all_identical = true;
     for (int i = 1; i < reaching_frames_.length(); i++) {
       if (!frame->Equals(reaching_frames_[i])) {
         all_identical = false;
         break;
       }
     }
     ASSERT(!all_identical || all_identical);
@@ skipping 247 matching lines @@
     fall_through.Branch(NegateCondition(cc), NegateHint(hint));
     Jump();  // May emit merge code here.
     fall_through.Bind();
   } else {
     DoBranch(cc, hint);
   }
 }
 
 
 DeferredCode::DeferredCode()
-    : masm_(CodeGeneratorScope::Current()->masm()),
+    : masm_(CodeGeneratorScope::Current(Isolate::Current())->masm()),
       statement_position_(masm_->positions_recorder()->
                           current_statement_position()),
       position_(masm_->positions_recorder()->current_position()),
-      frame_state_(CodeGeneratorScope::Current()->frame()) {
+      frame_state_(CodeGeneratorScope::Current(Isolate::Current())->frame()) {
   ASSERT(statement_position_ != RelocInfo::kNoPosition);
   ASSERT(position_ != RelocInfo::kNoPosition);
 
-  CodeGeneratorScope::Current()->AddDeferred(this);
+  CodeGeneratorScope::Current(Isolate::Current())->AddDeferred(this);
 #ifdef DEBUG
   comment_ = "";
 #endif
 }
 
 } }  // namespace v8::internal