summaryrefslogtreecommitdiff
path: root/js/src/gc/Nursery.h
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-03 15:50:22 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-03 15:50:22 -0500
commitd632ae27bd2f43e02938db31f168073bd67c41bc (patch)
tree465b1f4322c3a2439903d9cabb068169bf6b42c9 /js/src/gc/Nursery.h
parent97cdea2337c08bb1b07051ad6711e47bd6765eab (diff)
parent6323cededef2b1e3a6b1d3364e79185cb2a02e2a (diff)
downloaduxp-d632ae27bd2f43e02938db31f168073bd67c41bc.tar.gz
Merge branch 'master' into configurebuild-work
Diffstat (limited to 'js/src/gc/Nursery.h')
-rw-r--r--js/src/gc/Nursery.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h
index 69fb66b7a4..0d215d9975 100644
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -58,8 +58,6 @@ class NativeObject;
class Nursery;
class HeapSlot;
-void SetGCZeal(JSRuntime*, uint8_t, uint32_t);
-
namespace gc {
class AutoMaybeStartBackgroundAllocation;
struct Cell;
@@ -252,11 +250,6 @@ class Nursery
(numChunks() - currentChunk_ - 1) * NurseryChunkUsableSize;
}
-#ifdef JS_GC_ZEAL
- void enterZealMode();
- void leaveZealMode();
-#endif
-
/* Print total profile times on shutdown. */
void printTotalProfileTimes();
@@ -374,11 +367,6 @@ class Nursery
using NativeObjectVector = Vector<NativeObject*, 0, SystemAllocPolicy>;
NativeObjectVector dictionaryModeObjects_;
-#ifdef JS_GC_ZEAL
- struct Canary;
- Canary* lastCanary_;
-#endif
-
NurseryChunk* allocChunk();
NurseryChunk& chunk(unsigned index) const {