mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-27 01:01:52 -07:00
Code Issues Projects Releases Wiki Activity

Catch-up merge from master sources.

Browse source 
Copied from Perforce
 Change: 189140
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2016-02-11 23:42:07 +00:00
commit 9939dd3d3b
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mps/code/arena.c
View file

@ -423,6 +423,11 @@ static void arenaFreeLandFinish(Arena arena)
AVERT(Arena, arena);
AVER(arena->hasFreeLand);
/* We're about to free the memory occupied by the free land, which
contains a CBS. We want to make sure that LandFinish doesn't try
to check the CBS, so nuke it here. TODO: LandReset? */
arena->freeLandStruct.splayTreeStruct.root = TreeEMPTY;
/* The CBS block pool can't free its own memory via ArenaFree because
* that would use the free land. */
MFSFinishTracts(ArenaCBSBlockPool(arena), arenaMFSPageFreeVisitor,