From 3e233329d372ef42280ca3fc256d3247dff7104c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Mon, 18 Jun 2018 13:17:42 +0100
Subject: [PATCH] Assertions on the critical path.

Copied from Perforce
 Change: 193879
---
 mps/code/poolamc.c | 6 +++---
 mps/code/poolams.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mps/code/poolamc.c b/mps/code/poolamc.c
index b3aed84887e..4a1e25c79c1 100644
--- a/mps/code/poolamc.c
+++ b/mps/code/poolamc.c
@@ -1,7 +1,7 @@
 /* poolamc.c: AUTOMATIC MOSTLY-COPYING MEMORY POOL CLASS
  *
  * $Id$
- * Copyright (c) 2001-2016 Ravenbrook Limited.  See end of file for license.
+ * Copyright (c) 2001-2018 Ravenbrook Limited.  See end of file for license.
  * Portions copyright (C) 2002 Global Graphics Software.
  *
  * .sources: <design/poolamc/>.
@@ -1624,7 +1624,7 @@ static Res AMCFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
         grey = TraceSetUnion(grey, ss->traces);
         SegSetSummary(toSeg, RefSetUnion(SegSummary(toSeg), SegSummary(seg)));
       } else {
-        AVER(SegRankSet(toSeg) == RankSetEMPTY);
+        AVER_CRITICAL(SegRankSet(toSeg) == RankSetEMPTY);
       }
       SegSetGrey(toSeg, TraceSetUnion(SegGrey(toSeg), grey));
 
@@ -2112,7 +2112,7 @@ static Bool AMCCheck(AMC amc)
 
 /* C. COPYRIGHT AND LICENSE
  *
- * Copyright (C) 2001-2016 Ravenbrook Limited <http://www.ravenbrook.com/>.
+ * Copyright (C) 2001-2018 Ravenbrook Limited <http://www.ravenbrook.com/>.
  * All rights reserved.  This is an open source license.  Contact
  * Ravenbrook for commercial licensing options.
  * 
diff --git a/mps/code/poolams.c b/mps/code/poolams.c
index c40d752b5cc..5d0c56f0ea6 100644
--- a/mps/code/poolams.c
+++ b/mps/code/poolams.c
@@ -1,7 +1,7 @@
 /* poolams.c: AUTOMATIC MARK & SWEEP POOL CLASS
  *
  * $Id$
- * Copyright (c) 2001-2016 Ravenbrook Limited.  See end of file for license.
+ * Copyright (c) 2001-2018 Ravenbrook Limited.  See end of file for license.
  * Portions copyright (c) 2002 Global Graphics Software.
  *
  *
@@ -1412,7 +1412,7 @@ static Res AMSFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
   AVER_CRITICAL(refIO != NULL);
 
   format = pool->format;
-  AVERT(Format, format);
+  AVERT_CRITICAL(Format, format);
 
   amsseg = Seg2AMSSeg(seg);
   AVERT_CRITICAL(AMSSeg, amsseg);
@@ -1864,7 +1864,7 @@ Bool AMSCheck(AMS ams)
 
 /* C. COPYRIGHT AND LICENSE
  *
- * Copyright (C) 2001-2016 Ravenbrook Limited <http://www.ravenbrook.com/>.
+ * Copyright (C) 2001-2018 Ravenbrook Limited <http://www.ravenbrook.com/>.
  * All rights reserved.  This is an open source license.  Contact
  * Ravenbrook for commercial licensing options.
  *