Catch-up merge from master sources.

Copied from Perforce
 Change: 181651
 ServerID: perforce.ravenbrook.com

4 files changed, 22 insertions, 8 deletions

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 63facd0b6e5..11b54b902ab 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -239,7 +239,7 @@ TESTCASES=abqtest amcss amcsshe amcssth amsss amssshe apss arenacv awlut \
           messtest mpmss mpsicv poolncv qs sacss segsmss steptest \
           walkt0
 testrun: $(TESTCASES)
-        OUTPUT=$$(mktemp /tmp/mps-XXXXXX.log); \
+        OUTPUT=$$(mktemp /tmp/mps.log.XXXXXX); \
         echo "Logging test output to $$OUTPUT"; \
         $(^:%=(TESTCASE=$(PFM)/$(VARIETY)/%; \
               echo "\n\n-- Running $$TESTCASE at $$(date) --" >> $$OUTPUT && \
diff --git a/mps/code/lockutw3.c b/mps/code/lockutw3.c
index b135f0e1d43..51a1206a37d 100644
--- a/mps/code/lockutw3.c
+++ b/mps/code/lockutw3.c
@@ -74,6 +74,7 @@ int main(int argc, char *argv[])
   Insist(lock != NULL);
 
   LockInit(lock);
+  UNUSED(argc);
 
   shared = 0;
 
diff --git a/mps/code/qs.c b/mps/code/qs.c
index 2adc49ec4b9..2bf41c4c8f4 100644
--- a/mps/code/qs.c
+++ b/mps/code/qs.c
@@ -187,6 +187,7 @@ static void makerndlist(unsigned l)
 {
   unsigned i;
   mps_word_t r;
+  mps_addr_t addr;
 
   cdie(l > 0, "list len");
   if(list != NULL) {
@@ -194,8 +195,10 @@ static void makerndlist(unsigned l)
     list = NULL;
   }
   listl = l;
-  die(mps_alloc((mps_addr_t *)&list, mpool, (l * sizeof(mps_word_t))),
+  addr = list;
+  die(mps_alloc(&addr, mpool, (l * sizeof(mps_word_t))),
       "Alloc List");
+  list = addr;
   reg[0] = (mps_addr_t)0;
   regtag[0] = QSRef;
   for(i = 0; i < l; ++i) {
@@ -330,6 +333,8 @@ static void *go(void *p, size_t s)
 {
   mps_fmt_t format;
   mps_chain_t chain;
+  mps_addr_t base;
+  mps_addr_t *addr;
 
   testlib_unused(p);
   testlib_unused(s);
@@ -350,8 +355,11 @@ static void *go(void *p, size_t s)
                             reg,
                             NREGS),
       "RootCreateTable");
+  
+  base = &activationStack;
+  addr = base;
   die(mps_root_create_table(&actroot, arena, mps_rank_ambig(), 0,
-      (mps_addr_t *)&activationStack, sizeof(QSCell)/sizeof(mps_addr_t)),
+                            addr, sizeof(QSCell)/sizeof(mps_addr_t)),
       "RootCreateTable");
 
   /* makes a random list */
@@ -396,6 +404,7 @@ static mps_res_t scan1(mps_ss_t ss, mps_addr_t *objectIO)
 {
   QSCell cell;
   mps_res_t res;
+  mps_addr_t addr;
 
   cdie(objectIO != NULL, "objectIO");
 
@@ -404,20 +413,24 @@ static mps_res_t scan1(mps_ss_t ss, mps_addr_t *objectIO)
 
     switch(cell->tag) {
     case QSRef:
-      if(!MPS_FIX1(ss, (mps_addr_t)cell->value))
+      addr = cell->value;
+      if(!MPS_FIX1(ss, addr))
         goto fixTail;
-      res = MPS_FIX2(ss, (mps_addr_t *)&cell->value);
+      res = MPS_FIX2(ss, &addr);
       if(res != MPS_RES_OK)
         return res;
+      cell->value = addr;
     /* fall */
 
     case QSInt:
     fixTail:
-      if(!MPS_FIX1(ss, (mps_addr_t)cell->tail))
+      addr = cell->tail;
+      if(!MPS_FIX1(ss, addr))
         break;
-      res = MPS_FIX2(ss, (mps_addr_t *)&cell->tail);
+      res = MPS_FIX2(ss, &addr);
       if(res != MPS_RES_OK)
         return res;
+      cell->tail = addr;
       break;
 
     case QSEvac:
diff --git a/mps/code/version.c b/mps/code/version.c
index 03e7b78334e..0a9afed3476 100644
--- a/mps/code/version.c
+++ b/mps/code/version.c
@@ -29,7 +29,7 @@ SRCID(version, "$Id$");
  * (Note: before 2006-02-01 the style was "release.epcore.chub")
  */
 
-#define MPS_RELEASE "release/1.110.0"
+#define MPS_RELEASE "release/1.111.0"
 
 
 /* MPSCopyrightNotice -- copyright notice for the binary