Index: src/ia32/stub-cache-ia32.cc |
diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc |
index bc64085f4492ee0b7f48b8fc87caa176d555596b..fd5310d896cb23398012fc8444531c17243c9bdf 100644 |
--- a/src/ia32/stub-cache-ia32.cc |
+++ b/src/ia32/stub-cache-ia32.cc |
@@ -1409,10 +1409,8 @@ MUST_USE_RESULT MaybeObject* CallStubCompiler::CompileCallField( |
// 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); |
@@ -1561,10 +1559,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); |
@@ -1644,10 +1640,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); |
@@ -1728,10 +1722,8 @@ MaybeObject* CallStubCompiler::CompileStringCharCodeAtCall( |
// Restore function name in ecx. |
__ Set(ecx, Immediate(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); |
@@ -1814,10 +1806,8 @@ MaybeObject* CallStubCompiler::CompileStringCharAtCall( |
// Restore function name in ecx. |
__ Set(ecx, Immediate(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); |
@@ -1889,10 +1879,8 @@ MaybeObject* CallStubCompiler::CompileStringFromCharCodeCall( |
__ bind(&miss); |
// ecx: 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); |
@@ -2017,10 +2005,8 @@ MaybeObject* CallStubCompiler::CompileMathFloorCall(Object* object, |
__ bind(&miss); |
// ecx: 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); |
@@ -2122,10 +2108,8 @@ MaybeObject* CallStubCompiler::CompileMathAbsCall(Object* object, |
__ bind(&miss); |
// ecx: 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); |
@@ -2184,10 +2168,8 @@ MaybeObject* CallStubCompiler::CompileFastApiCall( |
__ add(Operand(esp), 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); |
@@ -2320,10 +2302,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); |
@@ -2388,10 +2368,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); |
@@ -2459,10 +2437,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); |