| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index 5678676fb0ceb94ffc12eba9ab3c297032753ee3..1ee7419715b1155d61dad19343820f49db1b85a4 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -1526,10 +1526,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);
|
| @@ -1686,10 +1684,8 @@ MaybeObject* CallStubCompiler::CompileArrayPushCall(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);
|
| @@ -1772,10 +1768,8 @@ MaybeObject* CallStubCompiler::CompileArrayPopCall(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);
|
| @@ -1858,10 +1852,8 @@ MaybeObject* CallStubCompiler::CompileStringCharCodeAtCall(
|
| // Restore function name in r2.
|
| __ Move(r2, 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);
|
| @@ -1946,10 +1938,8 @@ MaybeObject* CallStubCompiler::CompileStringCharAtCall(
|
| // Restore function name in r2.
|
| __ Move(r2, 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);
|
| @@ -2022,10 +2012,8 @@ MaybeObject* CallStubCompiler::CompileStringFromCharCodeCall(
|
|
|
| __ bind(&miss);
|
| // r2: 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);
|
| @@ -2171,8 +2159,8 @@ MaybeObject* CallStubCompiler::CompileMathFloorCall(Object* object,
|
|
|
| __ bind(&miss);
|
| // r2: function name.
|
| - MaybeObject* obj = GenerateMissBranch();
|
| - if (obj->IsFailure()) return obj;
|
| + MaybeObject* maybe_result = GenerateMissBranch();
|
| + if (maybe_result->IsFailure()) return maybe_result;
|
|
|
| // Return the generated code.
|
| return (cell == NULL) ? GetCode(function) : GetCode(NORMAL, name);
|
| @@ -2273,10 +2261,8 @@ MaybeObject* CallStubCompiler::CompileMathAbsCall(Object* object,
|
|
|
| __ bind(&miss);
|
| // r2: 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);
|
| @@ -2327,10 +2313,8 @@ MaybeObject* CallStubCompiler::CompileFastApiCall(
|
| FreeSpaceForFastApiCall(masm());
|
|
|
| __ 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);
|
| @@ -2461,10 +2445,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);
|
| @@ -2516,10 +2498,8 @@ MaybeObject* CallStubCompiler::CompileCallInterceptor(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(INTERCEPTOR, name);
|
| @@ -2585,10 +2565,8 @@ MaybeObject* CallStubCompiler::CompileCallGlobal(JSObject* object,
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| __ IncrementCounter(COUNTERS->call_global_inline_miss(), 1, r1, r3);
|
| - 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);
|
|
|