Bug 1483804 - Fix releaseAssertSameCompartment bustage when this merges to beta r=jandem
authorJon Coppeard <jcoppeard@mozilla.com>
Mon, 20 Aug 2018 10:10:38 +0100
changeset 487437 190e8fd11756a593da8222b050cd926425e2250d
parent 487436 18195ca7647ca50661158cbb1ad347029160c5aa
child 487438 76659fa6e0e0c22bf3f0fda416dd3fec601e9ae8
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs1483804
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1483804 - Fix releaseAssertSameCompartment bustage when this merges to beta r=jandem
js/src/vm/JSContext-inl.h
--- a/js/src/vm/JSContext-inl.h
+++ b/js/src/vm/JSContext-inl.h
@@ -15,18 +15,16 @@
 #include "vm/HelperThreads.h"
 #include "vm/Interpreter.h"
 #include "vm/Iteration.h"
 #include "vm/Realm.h"
 #include "vm/SymbolType.h"
 
 namespace js {
 
-#ifdef JS_CRASH_DIAGNOSTICS
-
 class CompartmentChecker
 {
     JS::Compartment* compartment;
 
   public:
     explicit CompartmentChecker(JSContext* cx)
       : compartment(cx->compartment())
     {
@@ -170,18 +168,16 @@ class CompartmentChecker
         check(desc.value(), argIndex);
     }
 
     void check(TypeSet::Type type, int argIndex) {
         check(type.maybeCompartment(), argIndex);
     }
 };
 
-#endif // JS_CRASH_DIAGNOSTICS
-
 /*
  * Don't perform these checks when called from a finalizer. The checking
  * depends on other objects not having been swept yet.
  */
 #define START_ASSERT_SAME_COMPARTMENT()                                 \
     if (JS::RuntimeHeapIsCollecting())                                  \
         return;                                                         \
     CompartmentChecker c(cx)