mozilla-central: changeset 134970:5c085ef24d2c278002d8c215497f5967c9c2d5e5

author	Dan Gohman <sunfish@google.com>
	Thu, 13 Jun 2013 10:23:21 -0700
changeset 134970	5c085ef24d2c278002d8c215497f5967c9c2d5e5
parent 134969	07a993bc014140c86822c8484001af97799209da
child 134971	7d95868cd23fcb197f59b19b990551b532b07282
push id	24820
push user	emorley@mozilla.com
push date	Fri, 14 Jun 2013 08:55:35 +0000
treeherder	mozilla-central@b7dbf40666b1 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sstangl
bugs	875917
milestone	24.0a1
first release with	nightly linux32 3d16d59c9317 / 24.0a1 / 20130615031212 / files nightly linux64 3d16d59c9317 / 24.0a1 / 20130615031212 / files nightly mac 3d16d59c9317 / 24.0a1 / 20130615031212 / files nightly win32 3d16d59c9317 / 24.0a1 / 20130615031212 / files nightly win64 3d16d59c9317 / 24.0a1 / 20130615031212 / files
last release without	nightly linux32 b197bed90a98 / 24.0a1 / 20130614031100 / files nightly linux64 b197bed90a98 / 24.0a1 / 20130614031100 / files nightly mac b197bed90a98 / 24.0a1 / 20130614031100 / files nightly win32 b197bed90a98 / 24.0a1 / 20130614031100 / files nightly win64 b197bed90a98 / 24.0a1 / 20130614031100 / files

--- a/js/src/ion/x86/CodeGenerator-x86.cpp
+++ b/js/src/ion/x86/CodeGenerator-x86.cpp
@@ -498,19 +498,19 @@ CodeGeneratorX86::visitAsmJSLoadHeap(LAs
     uint32_t after = masm.size();
     masm.bind(ool->rejoin());
     return gen->noteHeapAccess(AsmJSHeapAccess(cmp.offset(), before, after, vt, ToAnyRegister(out)));
 }
 
 bool
 CodeGeneratorX86::visitOutOfLineLoadTypedArrayOutOfBounds(OutOfLineLoadTypedArrayOutOfBounds *ool)
 {
-    if (ool->dest().isFloat())
+    if (ool->dest().isFloat()) {
         masm.movsd(&js_NaN, ool->dest().fpu());
-    else {
+    } else {
         Register destReg = ool->dest().gpr();
         masm.xorl(destReg, destReg);
     }
     masm.jmp(ool->rejoin());
     return true;
 }
 
 void