| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index b3990c34b1840b4cacca851ef0fd5236f894f8d1..918907b862ac49f20663660a577e49ada1baae9e 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -2003,7 +2003,7 @@ MaybeObject* MacroAssembler::TryCallStub(CodeStub* stub, Condition cond) {
|
|
|
|
|
| void MacroAssembler::TailCallStub(CodeStub* stub, Condition cond) {
|
| - ASSERT(stub->CompilingCallsToThisStubIsGCSafe() || allow_stub_calls_);
|
| + ASSERT(allow_stub_calls_ || stub->CompilingCallsToThisStubIsGCSafe());
|
| Jump(stub->GetCode(), RelocInfo::CODE_TARGET, cond);
|
| }
|
|
|
| @@ -2113,7 +2113,7 @@ MaybeObject* MacroAssembler::TryCallApiFunctionAndReturn(
|
|
|
| bool MacroAssembler::AllowThisStubCall(CodeStub* stub) {
|
| if (!has_frame_ && stub->SometimesSetsUpAFrame()) return false;
|
| - return stub->CompilingCallsToThisStubIsGCSafe() || allow_stub_calls_;
|
| + return allow_stub_calls_ || stub->CompilingCallsToThisStubIsGCSafe();
|
| }
|
|
|
|
|
|
|