| Index: src/arm/stub-cache-arm.cc
|
| ===================================================================
|
| --- src/arm/stub-cache-arm.cc (revision 5173)
|
| +++ src/arm/stub-cache-arm.cc (working copy)
|
| @@ -1252,9 +1252,11 @@
|
| }
|
|
|
|
|
| -void CallStubCompiler::GenerateMissBranch() {
|
| - Handle<Code> ic = ComputeCallMiss(arguments().immediate(), kind_);
|
| - __ Jump(ic, RelocInfo::CODE_TARGET);
|
| +Object* CallStubCompiler::GenerateMissBranch() {
|
| + Object* obj = StubCache::ComputeCallMiss(arguments().immediate(), kind_);
|
| + if (obj->IsFailure()) return obj;
|
| + __ Jump(Handle<Code>(Code::cast(obj)), RelocInfo::CODE_TARGET);
|
| + return obj;
|
| }
|
|
|
|
|
| @@ -1286,7 +1288,8 @@
|
|
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| - GenerateMissBranch();
|
| + Object* obj = GenerateMissBranch();
|
| + if (obj->IsFailure()) return obj;
|
|
|
| // Return the generated code.
|
| return GetCode(FIELD, name);
|
| @@ -1337,7 +1340,8 @@
|
|
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| - GenerateMissBranch();
|
| + Object* obj = GenerateMissBranch();
|
| + if (obj->IsFailure()) return obj;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -1388,7 +1392,8 @@
|
|
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| - GenerateMissBranch();
|
| + Object* obj = GenerateMissBranch();
|
| + if (obj->IsFailure()) return obj;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -1561,7 +1566,8 @@
|
| }
|
|
|
| __ bind(&miss_in_smi_check);
|
| - GenerateMissBranch();
|
| + Object* obj = GenerateMissBranch();
|
| + if (obj->IsFailure()) return obj;
|
|
|
| // Return the generated code.
|
| return GetCode(function);
|
| @@ -1610,7 +1616,8 @@
|
|
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| - GenerateMissBranch();
|
| + Object* obj = GenerateMissBranch();
|
| + if (obj->IsFailure()) return obj;
|
|
|
| // Return the generated code.
|
| return GetCode(INTERCEPTOR, name);
|
| @@ -1694,7 +1701,8 @@
|
| // Handle call cache miss.
|
| __ bind(&miss);
|
| __ IncrementCounter(&Counters::call_global_inline_miss, 1, r1, r3);
|
| - GenerateMissBranch();
|
| + Object* obj = GenerateMissBranch();
|
| + if (obj->IsFailure()) return obj;
|
|
|
| // Return the generated code.
|
| return GetCode(NORMAL, name);
|
|
|