Bug 690950: Move curly braces outside preprocessor conditionals, so Emacs expression motion commands work. r=dvander
authorJim Blandy <jimb@mozilla.com>
Tue, 04 Oct 2011 12:28:13 -0700
changeset 78096 7b1e5f4098513435f8f7569c67f665f47e90a71c
parent 78095 02bc0a560a434e29f74dc456ab31ab48223b766e
child 78097 9766b64ca8bf9ae805f72c742fc33a419901b3bf
push id2378
push userjblandy@mozilla.com
push dateTue, 04 Oct 2011 19:29:35 +0000
treeherdermozilla-inbound@7b1e5f409851 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdvander
bugs690950
milestone10.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 690950: Move curly braces outside preprocessor conditionals, so Emacs expression motion commands work. r=dvander
js/src/assembler/assembler/X86Assembler.h
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -2932,20 +2932,21 @@ private:
         {
             putModRm(ModRmRegister, reg, rm);
         }
 
         void memoryModRM(int reg, RegisterID base, int offset)
         {
             // A base of esp or r12 would be interpreted as a sib, so force a sib with no index & put the base in there.
 #if WTF_CPU_X86_64
-            if ((base == hasSib) || (base == hasSib2)) {
+            if ((base == hasSib) || (base == hasSib2))
 #else
-            if (base == hasSib) {
+            if (base == hasSib)
 #endif
+            {
                 if (!offset) // No need to check if the base is noBase, since we know it is hasSib!
                     putModRmSib(ModRmMemoryNoDisp, reg, base, noIndex, 0);
                 else if (CAN_SIGN_EXTEND_8_32(offset)) {
                     putModRmSib(ModRmMemoryDisp8, reg, base, noIndex, 0);
                     m_buffer.putByteUnchecked(offset);
                 } else {
                     putModRmSib(ModRmMemoryDisp32, reg, base, noIndex, 0);
                     m_buffer.putIntUnchecked(offset);
@@ -2966,20 +2967,21 @@ private:
                 }
             }
         }
     
         void memoryModRM_disp32(int reg, RegisterID base, int offset)
         {
             // A base of esp or r12 would be interpreted as a sib, so force a sib with no index & put the base in there.
 #if WTF_CPU_X86_64
-            if ((base == hasSib) || (base == hasSib2)) {
+            if ((base == hasSib) || (base == hasSib2))
 #else
-            if (base == hasSib) {
+            if (base == hasSib)
 #endif
+            {
                 putModRmSib(ModRmMemoryDisp32, reg, base, noIndex, 0);
                 m_buffer.putIntUnchecked(offset);
             } else {
                 putModRm(ModRmMemoryDisp32, reg, base);
                 m_buffer.putIntUnchecked(offset);
             }
         }