Bug 816701 - Fix branchTestObjShape to use input condition instead of hardcoding Assembler::NotEqual. r=mjrosenb
authorKannan Vijayan <kvijayan@mozilla.com>
Mon, 03 Dec 2012 13:30:39 -0500
changeset 123906 2d3c0823f7c25f8433d2db2588b05f49e360db64
parent 123905 210a6a177031e4b4c899720ebdd64bbf29a9d59c
child 123907 eeca66c44a6727d84c725908182c4a0e1a6bb235
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmjrosenb
bugs816701
milestone20.0a1
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
Bug 816701 - Fix branchTestObjShape to use input condition instead of hardcoding Assembler::NotEqual. r=mjrosenb
js/src/ion/IonMacroAssembler.h
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -138,18 +138,17 @@ class MacroAssembler : public MacroAssem
         loadBaseShapeClass(dest, dest);
     }
     void branchTestObjClass(Condition cond, Register obj, Register scratch, js::Class *clasp,
                             Label *label) {
         loadBaseShape(obj, scratch);
         branchPtr(cond, Address(scratch, BaseShape::offsetOfClass()), ImmWord(clasp), label);
     }
     void branchTestObjShape(Condition cond, Register obj, const Shape *shape, Label *label) {
-        branchPtr(Assembler::NotEqual, Address(obj, JSObject::offsetOfShape()),
-                  ImmGCPtr(shape), label);
+        branchPtr(cond, Address(obj, JSObject::offsetOfShape()), ImmGCPtr(shape), label);
     }
 
     void loadObjPrivate(Register obj, uint32_t nfixed, Register dest) {
         loadPtr(Address(obj, JSObject::getPrivateDataOffset(nfixed)), dest);
     }
 
     void loadObjProto(Register obj, Register dest) {
         loadPtr(Address(obj, JSObject::offsetOfType()), dest);