Bug 929414 - Fix small bug in MacroAssembler::extractTag. r=h4writer
authorJan de Mooij <jdemooij@mozilla.com>
Tue, 22 Oct 2013 14:14:50 +0200
changeset 165488 7f3af7b5ab295dddbfb103a305d878d61e987623
parent 165487 833a5441ef8b5d2d7112e1cebdac73ccaadc792f
child 165489 595c7dc7a02a0645322728e980dc539f05bacc69
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersh4writer
bugs929414
milestone27.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 929414 - Fix small bug in MacroAssembler::extractTag. r=h4writer
js/src/jit/IonMacroAssembler.h
--- a/js/src/jit/IonMacroAssembler.h
+++ b/js/src/jit/IonMacroAssembler.h
@@ -732,20 +732,19 @@ class MacroAssembler : public MacroAssem
         return extractObject(address, scratch);
     }
     Register extractString(const ValueOperand &value, Register scratch) {
         return extractObject(value, scratch);
     }
 
     using MacroAssemblerSpecific::extractTag;
     Register extractTag(const TypedOrValueRegister &reg, Register scratch) {
-        if (reg.hasValue()) {
+        if (reg.hasValue())
             return extractTag(reg.valueReg(), scratch);
-        }
-        mov(ImmWord(ValueTypeFromMIRType(reg.type())), scratch);
+        mov(ImmWord(MIRTypeToTag(reg.type())), scratch);
         return scratch;
     }
 
     using MacroAssemblerSpecific::extractObject;
     Register extractObject(const TypedOrValueRegister &reg, Register scratch) {
         if (reg.hasValue())
             return extractObject(reg.valueReg(), scratch);
         JS_ASSERT(reg.type() == MIRType_Object);