Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index e9fe2a8cd2fdb2f87f07dc62a1c2d952dd3a4bf6..2da6b62f565886c7b2276671092cf970506cb32c 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -118,7 +118,7 @@ void FullCodeGenerator::Generate() { |
CompilationInfo* info = info_; |
handler_table_ = |
isolate()->factory()->NewFixedArray(function()->handler_count(), TENURED); |
- profiling_counter_ = isolate()->factory()->NewJSGlobalPropertyCell( |
+ profiling_counter_ = isolate()->factory()->NewCell( |
Handle<Smi>(Smi::FromInt(FLAG_interrupt_budget), isolate())); |
SetFunctionPosition(function()); |
Comment cmnt(masm_, "[ function compiled by full code generator"); |
@@ -308,7 +308,7 @@ void FullCodeGenerator::ClearAccumulator() { |
void FullCodeGenerator::EmitProfilingCounterDecrement(int delta) { |
__ movq(rbx, profiling_counter_, RelocInfo::EMBEDDED_OBJECT); |
- __ SmiAddConstant(FieldOperand(rbx, JSGlobalPropertyCell::kValueOffset), |
+ __ SmiAddConstant(FieldOperand(rbx, Cell::kValueOffset), |
Smi::FromInt(-delta)); |
} |
@@ -323,8 +323,7 @@ void FullCodeGenerator::EmitProfilingCounterReset() { |
__ movq(kScratchRegister, |
reinterpret_cast<uint64_t>(Smi::FromInt(reset_value)), |
RelocInfo::NONE64); |
- __ movq(FieldOperand(rbx, JSGlobalPropertyCell::kValueOffset), |
- kScratchRegister); |
+ __ movq(FieldOperand(rbx, Cell::kValueOffset), kScratchRegister); |
} |
@@ -1128,14 +1127,12 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
Label non_proxy; |
__ bind(&fixed_array); |
- Handle<JSGlobalPropertyCell> cell = |
- isolate()->factory()->NewJSGlobalPropertyCell( |
- Handle<Object>( |
- Smi::FromInt(TypeFeedbackCells::kForInFastCaseMarker), |
- isolate())); |
+ Handle<Cell> cell = isolate()->factory()->NewCell( |
+ Handle<Object>(Smi::FromInt(TypeFeedbackCells::kForInFastCaseMarker), |
+ isolate())); |
RecordTypeFeedbackCell(stmt->ForInFeedbackId(), cell); |
__ LoadHeapObject(rbx, cell); |
- __ Move(FieldOperand(rbx, JSGlobalPropertyCell::kValueOffset), |
+ __ Move(FieldOperand(rbx, Cell::kValueOffset), |
Smi::FromInt(TypeFeedbackCells::kForInSlowCaseMarker)); |
__ Move(rbx, Smi::FromInt(1)); // Smi indicates slow check |
@@ -2620,8 +2617,7 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { |
flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET); |
Handle<Object> uninitialized = |
TypeFeedbackCells::UninitializedSentinel(isolate()); |
- Handle<JSGlobalPropertyCell> cell = |
- isolate()->factory()->NewJSGlobalPropertyCell(uninitialized); |
+ Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized); |
RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); |
__ Move(rbx, cell); |
@@ -2804,8 +2800,7 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) { |
// Record call targets in unoptimized code, but not in the snapshot. |
Handle<Object> uninitialized = |
TypeFeedbackCells::UninitializedSentinel(isolate()); |
- Handle<JSGlobalPropertyCell> cell = |
- isolate()->factory()->NewJSGlobalPropertyCell(uninitialized); |
+ Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized); |
RecordTypeFeedbackCell(expr->CallNewFeedbackId(), cell); |
__ Move(rbx, cell); |