mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Fixing bad merge

Browse source 
Copied from Perforce
 Change: 18649
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 1997-08-20 17:29:06 +01:00
parent 6dead75760
commit 89ff390eb8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mps/src/trace.c
View file

@ -1,12 +1,12 @@
/* impl.c.trace: GENERIC TRACER IMPLEMENTATION
*
* $HopeName: MMsrc!trace.c(trunk.36) $
* $HopeName: MMsrc!trace.c(trunk.37) $
* Copyright (C) 1997 The Harlequin Group Limited. All rights reserved.
*/
#include "mpm.h"
SRCID(trace, "$HopeName: MMsrc!trace.c(trunk.36) $");
SRCID(trace, "$HopeName: MMsrc!trace.c(trunk.37) $");
/* ScanStateCheck -- check consistency of a ScanState object */
@ -689,7 +689,7 @@ void TraceAccess(Arena arena, Seg seg, AccessSet mode)
/* If it's a read access, then the segment must be grey for a trace */
/* which is flipped. */
AVER((mode & SegSM(seg) & AccessREAD) == 0 ||
TraceSetInter(SegGrey(seg), space->flippedTraces) !=
TraceSetInter(SegGrey(seg), arena->flippedTraces) !=
TraceSetEMPTY);
/* If it's a write acess, then the segment must have a summary that */
@ -720,7 +720,7 @@ void TraceAccess(Arena arena, Seg seg, AccessSet mode)
/* because the latter may set the summary and raise the write barrier. */
if((mode & SegSM(seg) & AccessWRITE) != 0) /* write barrier? */
TraceSetSummary(space, seg, RefSetUNIV);
TraceSetSummary(arena, seg, RefSetUNIV);
/* The segment must now be accessible. */
AVER((mode & SegSM(seg)) == AccessSetEMPTY);