Index: src/jump-target-heavy.cc |
=================================================================== |
--- src/jump-target-heavy.cc (revision 7267) |
+++ src/jump-target-heavy.cc (working copy) |
@@ -35,9 +35,6 @@ |
namespace internal { |
-bool JumpTarget::compiling_deferred_code_ = false; |
- |
- |
void JumpTarget::Jump(Result* arg) { |
ASSERT(cgen()->has_valid_frame()); |
@@ -143,9 +140,9 @@ |
// 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; |
@@ -413,15 +410,15 @@ |
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 |