From 1e27c9f923b3705e5d408061eda55f841c22e41f Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Wed, 11 Sep 2013 11:18:16 -0400
Subject: [PATCH] Bug 915228 - part 1 - make DoubleEntry and field types
 MOZ_CONSTEXPR; r=mjrosenb

---
 js/src/jit/arm/Assembler-arm.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/js/src/jit/arm/Assembler-arm.h b/js/src/jit/arm/Assembler-arm.h
index 3fafd37d03d7..a214a52d6fb2 100644
--- a/js/src/jit/arm/Assembler-arm.h
+++ b/js/src/jit/arm/Assembler-arm.h
@@ -528,14 +528,13 @@ struct Imm8VFPImmData
     int32_t isInvalid : 12;
 
   public:
-    Imm8VFPImmData()
-      : imm4L(-1U & 0xf), imm4H(-1U & 0xf), isInvalid(-1)
+    MOZ_CONSTEXPR Imm8VFPImmData()
+      : imm4L(-1U & 0xf), pad(0), imm4H(-1U & 0xf), isInvalid(-1)
     { }
 
-    Imm8VFPImmData(uint32_t imm)
-      : imm4L(imm&0xf), imm4H(imm>>4), isInvalid(0)
+    MOZ_CONSTEXPR Imm8VFPImmData(uint8_t imm)
+      : imm4L(imm&0xf), pad(0), imm4H(imm>>4), isInvalid(0)
     {
-        JS_ASSERT(imm <= 0xff);
     }
 
     uint32_t encode() {
@@ -2212,7 +2211,7 @@ class DoubleEncoder {
         DoubleEntry()
           : dblTop(-1)
         { }
-        DoubleEntry(uint32_t dblTop_, datastore::Imm8VFPImmData data_)
+        MOZ_CONSTEXPR DoubleEntry(uint32_t dblTop_, datastore::Imm8VFPImmData data_)
           : dblTop(dblTop_), data(data_)
         { }
     };