1 files changed, 19 insertions, 7 deletions
diff --git a/js/src/vm/NativeObject.cpp b/js/src/vm/NativeObject.cpp
index 640a185981..19f8b94bb6 100644
--- a/js/src/vm/NativeObject.cpp
+++ b/js/src/vm/NativeObject.cpp
@@ -307,20 +307,26 @@ mozilla::Maybe<PropertyInfo> js::NativeObject::lookupPure(jsid id) {
   return mozilla::Nothing();
 }
 
-bool NativeObject::setUniqueId(JSContext* cx, uint64_t uid) {
+bool NativeObject::setUniqueId(JSRuntime* runtime, uint64_t uid) {
   MOZ_ASSERT(!hasUniqueId());
   MOZ_ASSERT(!gc::HasUniqueId(this));
 
-  return setOrUpdateUniqueId(cx, uid);
+  Nursery& nursery = runtime->gc.nursery();
+  if (!hasDynamicSlots() && !allocateSlots(nursery, 0)) {
+    return false;
+  }
+
+  getSlotsHeader()->setUniqueId(uid);
+  return true;
 }
 
 bool NativeObject::setOrUpdateUniqueId(JSContext* cx, uint64_t uid) {
-  if (!hasDynamicSlots() && !allocateSlots(cx, 0)) {
+  if (!hasDynamicSlots() && !allocateSlots(cx->nursery(), 0)) {
+    ReportOutOfMemory(cx);
     return false;
   }
 
   getSlotsHeader()->setUniqueId(uid);
-
   return true;
 }
 
@@ -337,7 +343,12 @@ bool NativeObject::growSlots(JSContext* cx, uint32_t oldCapacity,
   MOZ_ASSERT(newCapacity <= MAX_SLOTS_COUNT);
 
   if (!hasDynamicSlots()) {
-    return allocateSlots(cx, newCapacity);
+    if (!allocateSlots(cx->nursery(), newCapacity)) {
+      ReportOutOfMemory(cx);
+      return false;
+    }
+
+    return true;
   }
 
   uint64_t uid = maybeUniqueId();
@@ -415,7 +426,7 @@ bool NativeObject::allocateInitialSlots(JSContext* cx, uint32_t capacity) {
   return true;
 }
 
-bool NativeObject::allocateSlots(JSContext* cx, uint32_t newCapacity) {
+bool NativeObject::allocateSlots(Nursery& nursery, uint32_t newCapacity) {
   MOZ_ASSERT(!hasUniqueId());
   MOZ_ASSERT(!hasDynamicSlots());
 
@@ -423,7 +434,8 @@ bool NativeObject::allocateSlots(JSContext* cx, uint32_t newCapacity) {
 
   uint32_t dictionarySpan = getSlotsHeader()->dictionarySlotSpan();
 
-  HeapSlot* allocation = AllocateCellBuffer<HeapSlot>(cx, this, newAllocated);
+  HeapSlot* allocation =
+      AllocateCellBuffer<HeapSlot>(nursery, this, newAllocated);
   if (!allocation) {
     return false;
   }