1 files changed, 12 insertions, 2 deletions
diff --git a/js/src/vm/GeneratorObject.cpp b/js/src/vm/GeneratorObject.cpp
index 4f8d807df5..4a23c4ca9e 100644
--- a/js/src/vm/GeneratorObject.cpp
+++ b/js/src/vm/GeneratorObject.cpp
@@ -194,10 +194,10 @@ void AbstractGeneratorObject::dump() const {
 }
 #endif
 
-void AbstractGeneratorObject::finalSuspend(HandleObject obj) {
+void AbstractGeneratorObject::finalSuspend(JSContext* cx, HandleObject obj) {
   auto* genObj = &obj->as<AbstractGeneratorObject>();
   MOZ_ASSERT(genObj->isRunning());
-  genObj->setClosed();
+  genObj->setClosed(cx);
 }
 
 static AbstractGeneratorObject* GetGeneratorObjectForCall(JSContext* cx,
@@ -442,6 +442,16 @@ void AbstractGeneratorObject::setUnaliasedLocal(uint32_t slot,
   return stackStorage().setDenseElement(slot, value);
 }
 
+void AbstractGeneratorObject::setClosed(JSContext* cx) {
+  setFixedSlot(CALLEE_SLOT, NullValue());
+  setFixedSlot(ENV_CHAIN_SLOT, NullValue());
+  setFixedSlot(ARGS_OBJ_SLOT, NullValue());
+  setFixedSlot(STACK_STORAGE_SLOT, NullValue());
+  setFixedSlot(RESUME_INDEX_SLOT, NullValue());
+
+  DebugAPI::onGeneratorClosed(cx, this);
+}
+
 bool AbstractGeneratorObject::isAfterYield() {
   return isAfterYieldOrAwait(JSOp::Yield);
 }