Commit bb332195 authored by balazs.kilvady's avatar balazs.kilvady Committed by Commit bot

MIPS: Fix trampoline pool handling in MacroAssembler::BranchShort()

BUG=chromium:555543
LOG=N

Review URL: https://codereview.chromium.org/1448033002

Cr-Commit-Position: refs/heads/master@{#32017}
parent 462cc3c6
......@@ -2374,6 +2374,7 @@ bool MacroAssembler::BranchShortHelper(int16_t offset, Label* L, Condition cond,
// Be careful to always use shifted_branch_offset only just before the
// branch instruction, as the location will be remember for patching the
// target.
{
BlockTrampolinePoolScope block_trampoline_pool(this);
switch (cond) {
case cc_always:
......@@ -2488,7 +2489,7 @@ bool MacroAssembler::BranchShortHelper(int16_t offset, Label* L, Condition cond,
default:
UNREACHABLE();
}
}
// Emit a nop in the branch delay slot if required.
if (bdslot == PROTECT)
nop();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment