| Index: src/mips/stub-cache-mips.cc
|
| diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc
|
| index be32744b2e8fd7b5ac9fa3467995545915c88efc..bb2957c27a9cbed9317fdf98272f118446fa8b0a 100644
|
| --- a/src/mips/stub-cache-mips.cc
|
| +++ b/src/mips/stub-cache-mips.cc
|
| @@ -420,12 +420,12 @@ 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());
|
| __ li(scratch, Operand(cell));
|
| __ lw(scratch,
|
| - FieldMemOperand(scratch, JSGlobalPropertyCell::kValueOffset));
|
| + FieldMemOperand(scratch, PropertyCell::kValueOffset));
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
| __ Branch(miss, ne, scratch, Operand(at));
|
| }
|
| @@ -1600,12 +1600,12 @@ void CallStubCompiler::GenerateGlobalReceiverCheck(Handle<JSObject> object,
|
|
|
|
|
| void CallStubCompiler::GenerateLoadFunctionFromCell(
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Label* miss) {
|
| // Get the value from the cell.
|
| __ li(a3, Operand(cell));
|
| - __ lw(a1, FieldMemOperand(a3, JSGlobalPropertyCell::kValueOffset));
|
| + __ lw(a1, FieldMemOperand(a3, PropertyCell::kValueOffset));
|
|
|
| // Check that the cell contains the same function.
|
| if (heap()->InNewSpace(*function)) {
|
| @@ -1675,7 +1675,7 @@ Handle<Code> CallStubCompiler::CompileCallField(Handle<JSObject> object,
|
| Handle<Code> CallStubCompiler::CompileArrayPushCall(
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| @@ -1929,7 +1929,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall(
|
| Handle<Code> CallStubCompiler::CompileArrayPopCall(
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| @@ -2011,7 +2011,7 @@ Handle<Code> CallStubCompiler::CompileArrayPopCall(
|
| Handle<Code> CallStubCompiler::CompileStringCharCodeAtCall(
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| @@ -2093,7 +2093,7 @@ Handle<Code> CallStubCompiler::CompileStringCharCodeAtCall(
|
| Handle<Code> CallStubCompiler::CompileStringCharAtCall(
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| @@ -2174,7 +2174,7 @@ Handle<Code> CallStubCompiler::CompileStringCharAtCall(
|
| Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall(
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| @@ -2247,7 +2247,7 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall(
|
| Handle<Code> CallStubCompiler::CompileMathFloorCall(
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| @@ -2376,7 +2376,7 @@ Handle<Code> CallStubCompiler::CompileMathFloorCall(
|
| Handle<Code> CallStubCompiler::CompileMathAbsCall(
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| @@ -2476,7 +2476,7 @@ Handle<Code> CallStubCompiler::CompileFastApiCall(
|
| const CallOptimization& optimization,
|
| Handle<Object> object,
|
| Handle<JSObject> holder,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<JSFunction> function,
|
| Handle<String> name) {
|
|
|
| @@ -2649,7 +2649,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;
|
| @@ -2709,7 +2709,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 -------------
|
| @@ -2885,7 +2885,7 @@ Handle<Code> StoreStubCompiler::CompileStoreInterceptor(
|
|
|
| Handle<Code> StoreStubCompiler::CompileStoreGlobal(
|
| Handle<GlobalObject> object,
|
| - Handle<JSGlobalPropertyCell> cell,
|
| + Handle<PropertyCell> cell,
|
| Handle<Name> name) {
|
| Label miss;
|
|
|
| @@ -2900,12 +2900,12 @@ Handle<Code> StoreStubCompiler::CompileStoreGlobal(
|
| __ li(scratch1(), Operand(cell));
|
| __ LoadRoot(scratch2(), Heap::kTheHoleValueRootIndex);
|
| __ lw(scratch3(),
|
| - FieldMemOperand(scratch1(), JSGlobalPropertyCell::kValueOffset));
|
| + FieldMemOperand(scratch1(), PropertyCell::kValueOffset));
|
| __ Branch(&miss, eq, scratch3(), Operand(scratch2()));
|
|
|
| // Store the value in the cell.
|
| __ sw(value(),
|
| - FieldMemOperand(scratch1(), JSGlobalPropertyCell::kValueOffset));
|
| + FieldMemOperand(scratch1(), PropertyCell::kValueOffset));
|
| __ mov(v0, a0); // Stored value must be returned in v0.
|
| // Cells are always rescanned, so no write barrier here.
|
|
|
| @@ -3027,7 +3027,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;
|
| @@ -3039,7 +3039,7 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(
|
|
|
| // Get the value from the cell.
|
| __ li(a3, Operand(cell));
|
| - __ lw(t0, FieldMemOperand(a3, JSGlobalPropertyCell::kValueOffset));
|
| + __ lw(t0, FieldMemOperand(a3, PropertyCell::kValueOffset));
|
|
|
| // Check for deleted property if property can actually be deleted.
|
| if (!is_dont_delete) {
|
|
|