bug 858940: fix an additional case where we inspect the instruction stream without going through an iterator. r=jbramley

This commit is contained in:
Marty Rosenberg 2013-07-15 14:21:46 -04:00
parent e1c215a557
commit ce66f8b23c

View File

@ -341,6 +341,11 @@ MacroAssemblerARM::ma_movPatchable(Imm32 imm_, Register dest,
Assembler::Condition c, RelocStyle rs, Instruction *i)
{
int32_t imm = imm_.value;
if (i) {
// If the access goes through an iterator (which this doesn't) then
// all issues pertaining to reading guard instructions.
i = InstructionIterator(i).cur();
}
switch(rs) {
case L_MOVWT:
as_movw(dest, Imm16(imm & 0xffff), c, i);