Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 8b24bf10c9d8324b5d6923e1fd00a45eb34ca1b8..47adb0a8e11e4ee2cb62bacf7e4fd095e3bbd5eb 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -129,7 +129,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"); |
@@ -327,9 +327,9 @@ void FullCodeGenerator::ClearAccumulator() { |
void FullCodeGenerator::EmitProfilingCounterDecrement(int delta) { |
__ mov(r2, Operand(profiling_counter_)); |
- __ ldr(r3, FieldMemOperand(r2, JSGlobalPropertyCell::kValueOffset)); |
+ __ ldr(r3, FieldMemOperand(r2, Cell::kValueOffset)); |
__ sub(r3, r3, Operand(Smi::FromInt(delta)), SetCC); |
- __ str(r3, FieldMemOperand(r2, JSGlobalPropertyCell::kValueOffset)); |
+ __ str(r3, FieldMemOperand(r2, Cell::kValueOffset)); |
} |
@@ -345,7 +345,7 @@ void FullCodeGenerator::EmitProfilingCounterReset() { |
} |
__ mov(r2, Operand(profiling_counter_)); |
__ mov(r3, Operand(Smi::FromInt(reset_value))); |
- __ str(r3, FieldMemOperand(r2, JSGlobalPropertyCell::kValueOffset)); |
+ __ str(r3, FieldMemOperand(r2, Cell::kValueOffset)); |
} |
@@ -1164,15 +1164,13 @@ 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(r1, cell); |
__ mov(r2, Operand(Smi::FromInt(TypeFeedbackCells::kForInSlowCaseMarker))); |
- __ str(r2, FieldMemOperand(r1, JSGlobalPropertyCell::kValueOffset)); |
+ __ str(r2, FieldMemOperand(r1, Cell::kValueOffset)); |
__ mov(r1, Operand(Smi::FromInt(1))); // Smi indicates slow check |
__ ldr(r2, MemOperand(sp, 0 * kPointerSize)); // Get enumerated object |
@@ -2683,8 +2681,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); |
__ mov(r2, Operand(cell)); |
@@ -2879,8 +2876,7 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) { |
// Record call targets in unoptimized code. |
Handle<Object> uninitialized = |
TypeFeedbackCells::UninitializedSentinel(isolate()); |
- Handle<JSGlobalPropertyCell> cell = |
- isolate()->factory()->NewJSGlobalPropertyCell(uninitialized); |
+ Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized); |
RecordTypeFeedbackCell(expr->CallNewFeedbackId(), cell); |
__ mov(r2, Operand(cell)); |