Fix ARM assert (no bug, r=cdleary, a=legneato).
authorDavid Anderson <danderson@mozilla.com>
Fri, 24 Jun 2011 00:22:58 -0700
changeset 70498 af53ceda8b4ae0ca4d921c5353e9d75bf1f598fd
parent 70494 d3a2732c35f13b0afc423a8d9e32e8ee0ac96b0c
child 70499 3aac9d8c345259c6d0693da4b4295a974ba61cd7
push id78
push userdanderson@mozilla.com
push dateThu, 07 Jul 2011 00:56:07 +0000
treeherdermozilla-beta@af53ceda8b4a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscdleary, legneato
milestone6.0
Fix ARM assert (no bug, r=cdleary, a=legneato).
js/src/methodjit/PolyIC.h
--- a/js/src/methodjit/PolyIC.h
+++ b/js/src/methodjit/PolyIC.h
@@ -79,28 +79,28 @@ struct BaseIC : public MacroAssemblerTyp
     CodeLocationLabel fastPathRejoin;
 
     // Start of the slow path.
     CodeLocationLabel slowPathStart;
 
     // Slow path stub call.
     CodeLocationCall slowPathCall;
 
+    // Offset from start of stub to jump target of second shape guard as Nitro
+    // asm data location. This is 0 if there is only one shape guard in the
+    // last stub.
+    int32 secondShapeGuard;
+
     // Whether or not the callsite has been hit at least once.
     bool hit : 1;
     bool slowCallPatched : 1;
 
     // Number of stubs generated.
     uint32 stubsGenerated : 5;
 
-    // Offset from start of stub to jump target of second shape guard as Nitro
-    // asm data location. This is 0 if there is only one shape guard in the
-    // last stub.
-    int32 secondShapeGuard : 11;
-
     // Opcode this was compiled for.
     JSOp op : 9;
 
     void reset() {
         hit = false;
         slowCallPatched = false;
         stubsGenerated = 0;
         secondShapeGuard = 0;