Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Unified Diff: src/jump-target-heavy.cc

Issue 6685088: Merge isolates to bleeding_edge. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/jump-target-heavy.h ('k') | src/jump-target-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « src/jump-target-heavy.h ('k') | src/jump-target-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698