[JAEGER] Remove unnecessary padding from JSStackFrame, VMFrame. b=586880, r=dvander.
authorSean Stangl <sstangl@mozilla.com>
Fri, 13 Aug 2010 00:57:14 -0700
changeset 53415 3e8e9ebfebc20a871292e9d56c11f76852db2c5a
parent 53414 10de0bb7d329b7f883495821d38620c5857315a0
child 53417 f9bc6349358265dada74e3da4f983f80dbcb61f2
push idunknown
push userunknown
push dateunknown
reviewersdvander
bugs586880
milestone2.0b4pre
[JAEGER] Remove unnecessary padding from JSStackFrame, VMFrame. b=586880, r=dvander.
js/src/jsinterp.h
js/src/methodjit/MethodJIT.h
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -114,20 +114,16 @@ struct JSStackFrame
     JSStackFrame        *down;          /* previous frame, part of
                                            stack layout invariant */
     jsbytecode          *savedPC;       /* only valid if cx->fp != this */
 #ifdef DEBUG
     static jsbytecode *const sInvalidPC;
 #endif
 
     void                *ncode;         /* jit return pc */
-#if defined(JS_CPU_X86) || defined(JS_CPU_ARM)
-    /* Guh. Align. */
-    void                *align_[3];
-#endif
 
     /*
      * We can't determine in advance which local variables can live on
      * the stack and be freed when their dynamic scope ends, and which
      * will be closed over and need to live in the heap.  So we place
      * variables on the stack initially, note when they are closed
      * over, and copy those that are out to the heap when we leave
      * their dynamic scope.
@@ -164,18 +160,16 @@ struct JSStackFrame
     JSObject        *blockChain;
 
     uint32          flags;          /* frame flags -- see below */
 
     /* Members only needed for inline calls. */
     void            *hookData;      /* debugger call hook data */
     JSVersion       callerVersion;  /* dynamic version of calling script */
 
-    void            *padding;
-
     void putActivationObjects(JSContext *cx) {
         /*
          * The order of calls here is important as js_PutCallObject needs to
          * access argsobj.
          */
         if (callobj) {
             js_PutCallObject(cx, this);
             JS_ASSERT(!argsobj);
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -56,17 +56,17 @@
 namespace js {
 
 struct VMFrame
 {
     /* This must be the first entry on CPUs which push return addresses. */
     void *scriptedReturn;
 
 #if defined(JS_CPU_X86) || defined(JS_CPU_X64) || defined(JS_CPU_ARM)
-    uintptr_t               padding;
+    uint32 padding;
 #endif
 
     union Arguments {
         struct {
             void *ptr;
             void *ptr2;
         } x;
     } u;