From 8e64c44531a3d801738bc8aea3cc857b5edb2a63 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Mon, 1 Apr 2013 15:08:17 -0700
Subject: [PATCH] Bug 856344 - Fix getAllocKind() in TradeGuts (r=bhackett)

---
 js/src/jsobj.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 1d5603430edb..a1b86073fd77 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1826,7 +1826,7 @@ JSObject::ReserveForTradeGuts(JSContext *cx, JSObject *aArg, JSObject *bArg,
             return false;
     } else {
         reserved.newbshape = EmptyShape::getInitialShape(cx, aClass, aProto, a->getParent(),
-                                                         b->numFixedSlots());
+                                                         b->tenuredGetAllocKind());
         if (!reserved.newbshape)
             return false;
     }
@@ -1835,7 +1835,7 @@ JSObject::ReserveForTradeGuts(JSContext *cx, JSObject *aArg, JSObject *bArg,
             return false;
     } else {
         reserved.newashape = EmptyShape::getInitialShape(cx, bClass, bProto, b->getParent(),
-                                                         a->numFixedSlots());
+                                                         a->tenuredGetAllocKind());
         if (!reserved.newashape)
             return false;
     }