| Index: src/x64/stub-cache-x64.cc
|
| diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
|
| index 620f2098d1a2a1f741f110a1712230fa354f0947..d57940c1380ed5838278a5bd40aefedbb44e01f7 100644
|
| --- a/src/x64/stub-cache-x64.cc
|
| +++ b/src/x64/stub-cache-x64.cc
|
| @@ -1372,10 +1372,8 @@ MaybeObject* CallStubCompiler::CompileCallField(JSObject* object,
|
|
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(FIELD, name);
|
| @@ -1535,10 +1533,8 @@ MaybeObject* CallStubCompiler::CompileArrayPushCall(Object* object,
|
| }
|
|
|
| __ bind(&miss);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -1619,10 +1615,8 @@ MaybeObject* CallStubCompiler::CompileArrayPopCall(Object* object,
|
| 1);
|
|
|
| __ bind(&miss);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -1703,10 +1697,8 @@ MaybeObject* CallStubCompiler::CompileStringCharCodeAtCall(
|
| // Restore function name in rcx.
|
| __ Move(rcx, Handle<String>(name));
|
| __ bind(&name_miss);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -1789,10 +1781,8 @@ MaybeObject* CallStubCompiler::CompileStringCharAtCall(
|
| // Restore function name in rcx.
|
| __ Move(rcx, Handle<String>(name));
|
| __ bind(&name_miss);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -1860,10 +1850,8 @@ MaybeObject* CallStubCompiler::CompileStringFromCharCodeCall(
|
|
|
| __ bind(&miss);
|
| // rcx: function name.
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return (cell == NULL) ? GetCode(function) : GetCode(NORMAL, name);
|
| @@ -1975,10 +1963,8 @@ MaybeObject* CallStubCompiler::CompileMathAbsCall(Object* object,
|
|
|
| __ bind(&miss);
|
| // rcx: function name.
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return (cell == NULL) ? GetCode(function) : GetCode(NORMAL, name);
|
| @@ -2034,10 +2020,8 @@ MaybeObject* CallStubCompiler::CompileFastApiCall(
|
| __ addq(rsp, Immediate(kFastApiCallArguments * kPointerSize));
|
|
|
| __ bind(&miss_before_stack_reserved);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -2170,10 +2154,8 @@ MaybeObject* CallStubCompiler::CompileCallConstant(Object* object,
|
|
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -2239,10 +2221,8 @@ MaybeObject* CallStubCompiler::CompileCallInterceptor(JSObject* object,
|
|
|
| // Handle load cache miss.
|
| __ bind(&miss);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(INTERCEPTOR, name);
|
| @@ -2311,10 +2291,8 @@ MaybeObject* CallStubCompiler::CompileCallGlobal(JSObject* object,
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| __ IncrementCounter(COUNTERS->call_global_inline_miss(), 1);
|
| - Object* obj;
|
| - { MaybeObject* maybe_obj = GenerateMissBranch();
|
| - if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
| - }
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return GetCode(NORMAL, name);
|
|
|