Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1277174 - Forbid nursery allocations within AutoAssertEmptyNursery, r=jonco

Browse Source 
MozReview-Commit-ID: BY3ZQt9ax6a

--HG--
extra : rebase_source : 7001aaefe1590a903508fa6fe5186dff848319a8
This commit is contained in:
Steve Fink 2016-06-03 13:09:11 -07:00
parent 1eb9cc2888
commit 735d4c52b9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsgc.cpp
View File

@ -7635,6 +7635,8 @@ AutoAssertHeapBusy::checkCondition(JSRuntime *rt)
void void
AutoAssertEmptyNursery::checkCondition(JSRuntime *rt) { AutoAssertEmptyNursery::checkCondition(JSRuntime *rt) {
if (!noAlloc)
noAlloc.emplace(rt);
this->rt = rt; this->rt = rt;
MOZ_ASSERT(rt->gc.nursery.isEmpty()); MOZ_ASSERT(rt->gc.nursery.isEmpty());
} }

8
js/src/jsgc.h
View File

@ -1385,6 +1385,8 @@ class MOZ_RAII AutoAssertEmptyNursery
protected: protected:
JSRuntime* rt; JSRuntime* rt;
mozilla::Maybe<AutoAssertNoNurseryAlloc> noAlloc;
// Check that the nursery is empty. // Check that the nursery is empty.
void checkCondition(JSRuntime *rt); void checkCondition(JSRuntime *rt);
@ -1393,12 +1395,12 @@ class MOZ_RAII AutoAssertEmptyNursery
} }
public: public:
explicit AutoAssertEmptyNursery(JSRuntime* rt) { explicit AutoAssertEmptyNursery(JSRuntime* rt) : rt(nullptr) {
checkCondition(rt); checkCondition(rt);
} }
~AutoAssertEmptyNursery() { AutoAssertEmptyNursery(const AutoAssertEmptyNursery& other) : AutoAssertEmptyNursery(other.rt)
checkCondition(rt); {
} }
}; };