Bug 801922 - IonMonkey: LDefinition::BOX should only be defined with JS_PUNBOX64 (r=dvander)
authorLuke Wagner <luke@mozilla.com>
Tue, 16 Oct 2012 16:56:11 -0700
changeset 110808 875701feacbd7cae42214aede50641f7a420ba3f
parent 110807 c816cd711824c633886a76856af102a3467ea1e3
child 110809 1602ef5c86e210a999422102f015bb1a6988198e
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersdvander
bugs801922
milestone19.0a1
Bug 801922 - IonMonkey: LDefinition::BOX should only be defined with JS_PUNBOX64 (r=dvander)
js/src/ion/LIR.h
--- a/js/src/ion/LIR.h
+++ b/js/src/ion/LIR.h
@@ -424,19 +424,20 @@ class LDefinition
     enum Type {
         GENERAL,    // Generic, integer or pointer-width data (GPR).
         OBJECT,     // Pointer that may be collected as garbage (GPR).
         DOUBLE,     // 64-bit point value (FPU).
 #ifdef JS_NUNBOX32
         // A type virtual register must be followed by a payload virtual
         // register, as both will be tracked as a single gcthing.
         TYPE,
-        PAYLOAD,
+        PAYLOAD
+#else
+        BOX         // Joined box, for punbox systems. (GPR, gcthing)
 #endif
-        BOX         // Joined box, for punbox systems. (GPR, gcthing)
     };
 
     void set(uint32 index, Type type, Policy policy) {
         JS_STATIC_ASSERT(MAX_VIRTUAL_REGISTERS <= VREG_MASK);
         bits_ = (index << VREG_SHIFT) | (policy << POLICY_SHIFT) | (type << TYPE_SHIFT);
     }
 
   public: