Index: src/x64/stub-cache-x64.cc |
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc |
index c1059050ce16799d123f6d9dfececc37b58baade..402945cfa2cbb2f2bed43b5c58e9894505d66707 100644 |
--- a/src/x64/stub-cache-x64.cc |
+++ b/src/x64/stub-cache-x64.cc |
@@ -737,7 +737,7 @@ static void GenerateCheckPropertyCell(MacroAssembler* masm, |
Handle<Name> name, |
Register scratch, |
Label* miss) { |
- Handle<JSGlobalPropertyCell> cell = |
+ Handle<PropertyCell> cell = |
GlobalObject::EnsurePropertyCell(global, name); |
ASSERT(cell->value()->IsTheHole()); |
__ Move(scratch, cell); |
@@ -2445,7 +2445,7 @@ Handle<Code> CallStubCompiler::CompileCallConstant( |
Handle<JSFunction> function) { |
if (HasCustomCallGenerator(function)) { |
Handle<Code> code = CompileCustomCall(object, holder, |
- Handle<JSGlobalPropertyCell>::null(), |
+ Handle<PropertyCell>::null(), |
function, Handle<String>::cast(name)); |
// A null handle means bail out to the regular compiler code below. |
if (!code.is_null()) return code; |
@@ -2525,7 +2525,7 @@ Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object, |
Handle<Code> CallStubCompiler::CompileCallGlobal( |
Handle<JSObject> object, |
Handle<GlobalObject> holder, |
- Handle<JSGlobalPropertyCell> cell, |
+ Handle<PropertyCell> cell, |
Handle<JSFunction> function, |
Handle<Name> name) { |
// ----------- S t a t e ------------- |
@@ -2708,7 +2708,7 @@ Handle<Code> StoreStubCompiler::CompileStoreInterceptor( |
Handle<Code> StoreStubCompiler::CompileStoreGlobal( |
Handle<GlobalObject> object, |
- Handle<JSGlobalPropertyCell> cell, |
+ Handle<PropertyCell> cell, |
Handle<Name> name) { |
Label miss; |
@@ -2720,7 +2720,7 @@ Handle<Code> StoreStubCompiler::CompileStoreGlobal( |
// Compute the cell operand to use. |
__ Move(scratch1(), cell); |
Operand cell_operand = |
- FieldOperand(scratch1(), JSGlobalPropertyCell::kValueOffset); |
+ FieldOperand(scratch1(), PropertyCell::kValueOffset); |
// Check that the value in the cell is not the hole. If it is, this |
// cell could have been deleted and reintroducing the global needs |
@@ -2888,7 +2888,7 @@ void LoadStubCompiler::GenerateLoadViaGetter(MacroAssembler* masm, |
Handle<Code> LoadStubCompiler::CompileLoadGlobal( |
Handle<JSObject> object, |
Handle<GlobalObject> global, |
- Handle<JSGlobalPropertyCell> cell, |
+ Handle<PropertyCell> cell, |
Handle<Name> name, |
bool is_dont_delete) { |
Label success, miss; |
@@ -2902,7 +2902,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal( |
// Get the value from the cell. |
__ Move(rbx, cell); |
- __ movq(rbx, FieldOperand(rbx, JSGlobalPropertyCell::kValueOffset)); |
+ __ movq(rbx, FieldOperand(rbx, PropertyCell::kValueOffset)); |
// Check for deleted property if property can actually be deleted. |
if (!is_dont_delete) { |