Backed out changeset 302fb81f0729 (bug 858940) for frequent Android test crashes.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 16 Jul 2013 11:05:11 -0400
changeset 138688 da9f2ffcfc4d0520af24304b714657bdb301fd53
parent 138687 29731607f35e7cc7d2c94af0bbccb95fe2cc7d56
child 138689 b41c7f2ddda5f28f29818f24216e7db16ac86460
push id24964
push userryanvm@gmail.com
push dateTue, 16 Jul 2013 20:04:09 +0000
treeherderautoland@fd10ead17ace [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs858940
milestone25.0a1
backs out302fb81f07292d351c06908a11fab95afc5ef1df
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 302fb81f0729 (bug 858940) for frequent Android test crashes.
js/src/ion/arm/MacroAssembler-arm.cpp
--- a/js/src/ion/arm/MacroAssembler-arm.cpp
+++ b/js/src/ion/arm/MacroAssembler-arm.cpp
@@ -336,21 +336,16 @@ NextInst(Instruction *i)
     return i->next();
 }
 
 void
 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);
         // i can be NULL here.  that just means "insert in the next in sequence."
         // NextInst is special cased to not do anything when it is passed NULL, so two
         // consecutive instructions will be inserted.
         i = NextInst(i);
         as_movt(dest, Imm16(imm >> 16 & 0xffff), c, i);