summaryrefslogtreecommitdiffstats
path: root/js/src/shell
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-02-20 12:00:26 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-02-20 12:00:26 +0100
commit59f7a2cdb4f36f017586aa139a7fe8def39e777b (patch)
tree45779e58d11a2e540cb7db858c383d4471ab475b /js/src/shell
parente3d81b698ea104e4b55ee618b931ea1311c04169 (diff)
downloadUXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar
UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.gz
UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.lz
UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.xz
UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.zip
Issue #316 - Make the memory GC performance object conditional (WIP)
This was only added for GCubench and likely interfering with building without devtools-server.
Diffstat (limited to 'js/src/shell')
-rw-r--r--js/src/shell/js.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 36558a694..4b0c858a4 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -7090,6 +7090,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options,
if (!DefineOS(cx, glob, fuzzingSafe, &gOutFile, &gErrFile))
return nullptr;
+#ifdef MOZ_DEVTOOLS_SERVER
RootedObject performanceObj(cx, JS_NewObject(cx, nullptr));
if (!performanceObj)
return nullptr;
@@ -7105,6 +7106,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options,
return nullptr;
if (!JS_DefineProperty(cx, mozMemoryObj, "gc", gcObj, JSPROP_ENUMERATE))
return nullptr;
+#endif
/* Initialize FakeDOMObject. */
static const js::DOMCallbacks DOMcallbacks = {