From cf8288afe6c5f638e401c0da98475371ce00ff25 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Wed, 1 Aug 2018 11:25:50 +0200
Subject: [PATCH] Bug 1474272 part 3 - Call AssertHeapIsIdleOrIterating instead
 of AssertHeapIsIdle in JS::GetNonCCWObjectGlobal. r=jonco

---
 js/src/jsapi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index de64755db3a6..1d7af0c2a731 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1266,7 +1266,7 @@ JS::CurrentGlobalOrNull(JSContext* cx)
 JS_PUBLIC_API(JSObject*)
 JS::GetNonCCWObjectGlobal(JSObject* obj)
 {
-    AssertHeapIsIdle();
+    AssertHeapIsIdleOrIterating();
     MOZ_DIAGNOSTIC_ASSERT(!IsCrossCompartmentWrapper(obj));
     return &obj->nonCCWGlobal();
 }