vendor/v8/src/jump-target-heavy.cc in mustang-0.0.1 vs vendor/v8/src/jump-target-heavy.cc in mustang-0.1.0

@@ -33,13 +33,10 @@
 
 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();
@@ -141,13 +138,13 @@
 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();
+  Isolate::Current()->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])) {
@@ -411,18 +408,18 @@
   }
 }
 
 
 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
 }