Catch-up merge from master sources at changelevel 194776 to version/1…

….117. Copied from Perforce Change: 194779
Ravenbrook · Jul 30, 2018 · d5a5b48 · d5a5b48
2 parents 65710cb + 2f50b92
commit d5a5b48
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/code/ananmv.nmk b/code/ananmv.nmk
@@ -1,7 +1,7 @@
 # ananmv.nmk: ANSI/ANSI/MICROSOFT VISUAL C/C++ NMAKE FILE -*- makefile -*-
 #
 # $Id$
-# Copyright (c) 2001-2014 Ravenbrook Limited.  See end of file for license.
+# Copyright (c) 2001-2018 Ravenbrook Limited.  See end of file for license.
 
 PFM = ananmv
 
@@ -13,7 +13,6 @@ MPMPF = \
     [prmcanan] \
     [protan] \
     [span] \
-    [ssan] \
     [than] \
     [vman]
 
@@ -24,7 +23,7 @@ MPMPF = \
 
 # C. COPYRIGHT AND LICENSE
 #
-# Copyright (C) 2001-2014 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/code/poolmv2.c b/code/poolmv2.c
@@ -574,7 +574,7 @@ static Bool MVTSplinterFill(Addr *baseReturn, Addr *limitReturn,
 static void MVTOneSegOnly(Addr *baseIO, Addr *limitIO, MVT mvt, Size minSize)
 {
   Addr base, limit, segLimit;
-  Seg seg;
+  Seg seg = NULL;           /* suppress "may be used uninitialized" */
   Arena arena;
 
   base = *baseIO;
@@ -979,7 +979,7 @@ static void MVTFree(Pool pool, Addr base, Size size)
   /* <design/poolmvt/#arch.ap.no-fit.oversize.policy> */
   /* Return exceptional blocks directly to arena */
   if (size > mvt->fillSize) {
-    Seg seg;
+    Seg seg = NULL;         /* suppress "may be used uninitialized" */
     SURELY(SegOfAddr(&seg, PoolArena(pool), base));
     AVER(base == SegBase(seg));
     AVER(limit <= SegLimit(seg));
@@ -1190,7 +1190,7 @@ static Bool MVTReturnSegs(MVT mvt, Range range, Arena arena)
   limit = RangeLimit(range);
 
   while (base < limit) {
-    Seg seg;
+    Seg seg = NULL;         /* suppress "may be used uninitialized" */
     Addr segBase, segLimit;
 
     SURELY(SegOfAddr(&seg, arena, base));
@@ -1331,7 +1331,7 @@ static Bool MVTContingencySearch(Addr *baseReturn, Addr *limitReturn,
 
 static Bool MVTCheckFit(Addr base, Addr limit, Size min, Arena arena)
 {
-  Seg seg;
+  Seg seg = NULL;           /* suppress "may be used uninitialized" */
   Addr segLimit;
 
   SURELY(SegOfAddr(&seg, arena, base));

diff --git a/test/argerr/148.c b/test/argerr/148.c
@@ -222,6 +222,7 @@ static mps_res_t myscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit)
        */
        comment("About to fix with null pointer...");
        MPS_SCAN_BEGIN(ss) {
+         (void)MPS_FIX1(ss, NULL);
          res = MPS_FIX2(ss, NULL);
        } MPS_SCAN_END(ss);
        error("fix with null pointer");