Backed out changeset d3a026933bce (bug 1308039) for spidermonkey bust…

…age. r=backout on a CLOSED TREE UltraBlame original commit: 5fa834fe9b96d1b6b1cf99d14335b0beb1bd3811
marco-c · Sep 30, 2019 · 750be22 · 750be22
1 parent c7d94d7
commit 750be22
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 27 deletions.
diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h
@@ -489,13 +489,24 @@ GetGCNumber();
 
 class JS_PUBLIC_API(AutoAssertOnGC)
 {
+#ifdef DEBUG
     js::gc::GCRuntime* gc;
     size_t gcNumber;
 
   public:
     AutoAssertOnGC();
     explicit AutoAssertOnGC(JSContext* cx);
     ~AutoAssertOnGC();
+
+    static void VerifyIsSafeToGC(JSRuntime* rt);
+#else
+  public:
+    AutoAssertOnGC() {}
+    explicit AutoAssertOnGC(JSContext* cx) {}
+    ~AutoAssertOnGC() {}
+
+    static void VerifyIsSafeToGC(JSRuntime* rt) {}
+#endif
 };
 
 
@@ -565,23 +576,12 @@ class JS_PUBLIC_API(AutoAssertGCCallback) : public AutoSuppressGCAnalysis
 
 
 
-
-
-#ifdef DEBUG
 class JS_PUBLIC_API(AutoCheckCannotGC) : public AutoAssertOnGC
 {
   public:
     AutoCheckCannotGC() : AutoAssertOnGC() {}
     explicit AutoCheckCannotGC(JSContext* cx) : AutoAssertOnGC(cx) {}
 } JS_HAZ_GC_INVALIDATED;
-#else
-class JS_PUBLIC_API(AutoCheckCannotGC)
-{
-  public:
-    AutoCheckCannotGC() {}
-    explicit AutoCheckCannotGC(JSContext* cx) {}
-} JS_HAZ_GC_INVALIDATED;
-#endif
 
 
 

diff --git a/js/src/gc/Allocator.cpp b/js/src/gc/Allocator.cpp
@@ -203,7 +203,7 @@ GCRuntime::checkAllocatorState(JSContext* cx, AllocKind kind)
 
 
     if (allowGC && !rt->mainThread.suppressGC)
-        rt->gc.verifyIsSafeToGC();
+        JS::AutoAssertOnGC::VerifyIsSafeToGC(rt);
 
 
     if (js::oom::ShouldFailWithOOM()) {

diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
@@ -721,25 +721,20 @@ class GCRuntime
         --noNurseryAllocationCheck;
     }
 
-    bool isStrictProxyCheckingEnabled() { return disableStrictProxyCheckingCount == 0; }
-    void disableStrictProxyChecking() { ++disableStrictProxyCheckingCount; }
-    void enableStrictProxyChecking() {
-        MOZ_ASSERT(disableStrictProxyCheckingCount > 0);
-        --disableStrictProxyCheckingCount;
-    }
-#endif 
-
     bool isInsideUnsafeRegion() { return inUnsafeRegion != 0; }
     void enterUnsafeRegion() { ++inUnsafeRegion; }
     void leaveUnsafeRegion() {
         MOZ_ASSERT(inUnsafeRegion > 0);
         --inUnsafeRegion;
     }
 
-    void verifyIsSafeToGC() {
-        MOZ_DIAGNOSTIC_ASSERT(!isInsideUnsafeRegion(),
-                              "[AutoAssertOnGC] possible GC in GC-unsafe region");
+    bool isStrictProxyCheckingEnabled() { return disableStrictProxyCheckingCount == 0; }
+    void disableStrictProxyChecking() { ++disableStrictProxyCheckingCount; }
+    void enableStrictProxyChecking() {
+        MOZ_ASSERT(disableStrictProxyCheckingCount > 0);
+        --disableStrictProxyCheckingCount;
     }
+#endif 
 
     void setAlwaysPreserveCode() { alwaysPreserveCode = true; }
 
@@ -1349,6 +1344,7 @@ class GCRuntime
 
     bool alwaysPreserveCode;
 
+#ifdef DEBUG
 
 
 
@@ -1357,7 +1353,6 @@ class GCRuntime
 
     int inUnsafeRegion;
 
-#ifdef DEBUG
     size_t noGCOrAllocationCheck;
     size_t noNurseryAllocationCheck;
 

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
@@ -864,8 +864,8 @@ GCRuntime::GCRuntime(JSRuntime* rt) :
     mallocBytesUntilGC(0),
     mallocGCTriggered(false),
     alwaysPreserveCode(false),
-    inUnsafeRegion(0),
 #ifdef DEBUG
+    inUnsafeRegion(0),
     noGCOrAllocationCheck(0),
     noNurseryAllocationCheck(0),
     arenasEmptyAtShutdown(true),
@@ -6133,7 +6133,7 @@ GCRuntime::gcCycle(bool nonincrementalByAPI, SliceBudget& budget, JS::gcreason::
     MOZ_ASSERT(!rt->mainThread.suppressGC);
 
 
-    verifyIsSafeToGC();
+    JS::AutoAssertOnGC::VerifyIsSafeToGC(rt);
 
     {
         gcstats::AutoPhase ap(stats, gcstats::PHASE_WAIT_BACKGROUND_THREAD);
@@ -6974,6 +6974,7 @@ JS::GetGCNumber()
 }
 #endif
 
+#ifdef DEBUG
 JS::AutoAssertOnGC::AutoAssertOnGC()
   : gc(nullptr), gcNumber(0)
 {
@@ -7013,6 +7014,13 @@ JS::AutoAssertOnGC::~AutoAssertOnGC()
     }
 }
 
+ void
+JS::AutoAssertOnGC::VerifyIsSafeToGC(JSRuntime* rt)
+{
+    if (rt->gc.isInsideUnsafeRegion())
+        MOZ_CRASH("[AutoAssertOnGC] possible GC in GC-unsafe region");
+}
+
 JS::AutoAssertNoAlloc::AutoAssertNoAlloc(JSContext* cx)
   : gc(nullptr)
 {

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
@@ -363,7 +363,7 @@ js::RunScript(JSContext* cx, RunState& state)
     JS_CHECK_RECURSION(cx, return false);
 
 
-    cx->runtime()->gc.verifyIsSafeToGC();
+    JS::AutoAssertOnGC::VerifyIsSafeToGC(cx->runtime());
 
     if (!Debugger::checkNoExecute(cx, state.script()))
         return false;