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

Fix issues identified in review by gdr.

Browse source 
Copied from Perforce
 Change: 194472
This commit is contained in:
Gareth Rees 2018-07-06 11:48:41 +01:00
parent 0edb390dc4
commit cf9dbca31c
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

39
mps/code/seg.c
View file

@ -863,6 +863,26 @@ Bool SegCheck(Seg seg)
/* Can't BoolCheck seg->queued because compilers warn about that on
single-bit fields. */
/* Each tract of the segment must agree about the segment and its
* pool. Note that even if the CHECKs are compiled away there is
* still a significant cost in looping over the tracts, hence the
* guard. See job003778. */
#if defined(AVER_AND_CHECK_ALL)
{
Tract tract;
Addr addr;
TRACT_TRACT_FOR(tract, addr, arena, seg->firstTract, seg->limit) {
Seg trseg = NULL; /* suppress compiler warning */
CHECKD_NOSIG(Tract, tract);
CHECKL(TRACT_SEG(&trseg, tract));
CHECKL(trseg == seg);
CHECKL(TractPool(tract) == pool);
}
CHECKL(addr == seg->limit);
}
#endif /* AVER_AND_CHECK_ALL */
/* The segment must belong to some pool, so it should be on a */
/* pool's segment ring. (Actually, this isn't true just after */
/* the segment is initialized.) */
@ -1598,25 +1618,6 @@ static void gcSegSetWhite(Seg seg, TraceSet white)
AVERT_CRITICAL(GCSeg, gcseg);
AVER_CRITICAL(&gcseg->segStruct == seg);
#if 0
Arena arena;
Tract tract;
Addr addr, limit;
arena = PoolArena(SegPool(seg));
AVERT_CRITICAL(Arena, arena);
limit = SegLimit(seg);
/* Each tract of the segment records white traces */
TRACT_TRACT_FOR(tract, addr, arena, seg->firstTract, limit) {
Seg trseg = NULL; /* suppress compiler warning */
AVERT_CRITICAL(Tract, tract);
AVER_CRITICAL(TRACT_SEG(&trseg, tract));
AVER_CRITICAL(trseg == seg);
TractSetWhite(tract, BS_BITFIELD(Trace, white));
}
AVER_CRITICAL(addr == limit);
#endif
seg->white = BS_BITFIELD(Trace, white);
}

2
mps/design/trace.txt
View file

@ -138,7 +138,7 @@ whether it points to a tract) in order to check the `.exact.legal`_
condition.
_`.fix.whiteseg`: The reason for looking up the tract is to determine
whether the refernce is to a white segment.
whether the reference is to a white segment.
.. note::