From b0a291feca734a7cb8bf3008bf58f14c397165b6 Mon Sep 17 00:00:00 2001
From: Marty Rosenberg <mrosenberg@mozilla.com>
Date: Wed, 26 Oct 2011 12:35:41 -0700
Subject: [PATCH] When using DoubleConditionBitSpecial, actually strip out the
 bits before emitting an instruction (bug 691073, r=dvander)

---
 js/src/assembler/assembler/MacroAssemblerARM.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/src/assembler/assembler/MacroAssemblerARM.h b/js/src/assembler/assembler/MacroAssemblerARM.h
index 2ab019c5da3b..db97652d972d 100644
--- a/js/src/assembler/assembler/MacroAssemblerARM.h
+++ b/js/src/assembler/assembler/MacroAssemblerARM.h
@@ -43,8 +43,7 @@ namespace JSC {
 
 class MacroAssemblerARM : public AbstractMacroAssembler<ARMAssembler> {
     static const int DoubleConditionMask = 0x0f;
-    static const int DoubleConditionBitSpecial = 0x10;
-    COMPILE_ASSERT(!(DoubleConditionBitSpecial & DoubleConditionMask), DoubleConditionBitSpecial_should_not_interfere_with_ARMAssembler_Condition_codes);
+    static const int DoubleConditionBitSpecial = 0x8;
 public:
     enum Condition {
         Equal = ARMAssembler::EQ,