| Index: src/ia32/macro-assembler-ia32.cc
|
| diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
|
| index 405ae516dcc2d8339a485f50acf34990bf45c8c7..2e0560d6a80dae4e656be31ae8cb853151122772 100644
|
| --- a/src/ia32/macro-assembler-ia32.cc
|
| +++ b/src/ia32/macro-assembler-ia32.cc
|
| @@ -1510,7 +1510,7 @@ MaybeObject* MacroAssembler::TryCallStub(CodeStub* stub) {
|
|
|
|
|
| void MacroAssembler::TailCallStub(CodeStub* stub) {
|
| - ASSERT(stub->CompilingCallsToThisStubIsGCSafe() || allow_stub_calls_);
|
| + ASSERT(allow_stub_calls_ || stub->CompilingCallsToThisStubIsGCSafe());
|
| jmp(stub->GetCode(), RelocInfo::CODE_TARGET);
|
| }
|
|
|
| @@ -1533,7 +1533,7 @@ void MacroAssembler::StubReturn(int argc) {
|
|
|
| bool MacroAssembler::AllowThisStubCall(CodeStub* stub) {
|
| if (!has_frame_ && stub->SometimesSetsUpAFrame()) return false;
|
| - return stub->CompilingCallsToThisStubIsGCSafe() || allow_stub_calls_;
|
| + return allow_stub_calls_ || stub->CompilingCallsToThisStubIsGCSafe();
|
| }
|
|
|
|
|
|
|