From 6436ca441df44c6975d31072ffc431dc42477e1d Mon Sep 17 00:00:00 2001
From: Richard Brooksby <rb@ravenbrook.com>
Date: Mon, 3 Sep 2012 13:38:53 +0100
Subject: [PATCH] Checking and suppressing warnings caused by higher level of
 optimisation and building from mps.c on ubuntu 12.

Copied from Perforce
 Change: 179194
 ServerID: perforce.ravenbrook.com
---
 mps/code/arenacl.c | 2 +-
 mps/code/arenavm.c | 2 +-
 mps/code/cbs.c     | 2 +-
 mps/code/poolmrg.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mps/code/arenacl.c b/mps/code/arenacl.c
index 5d59abb9827..2238dddb4f6 100644
--- a/mps/code/arenacl.c
+++ b/mps/code/arenacl.c
@@ -406,7 +406,7 @@ static Res ClientAlloc(Addr *baseReturn, Tract *baseTractReturn,
 static void ClientFree(Addr base, Size size, Pool pool)
 {
   Arena arena;
-  Chunk chunk;
+  Chunk chunk = NULL;           /* suppress "may be used uninitialized" */
   Size pages;
   ClientArena clientArena;
   Index pi, baseIndex, limitIndex;
diff --git a/mps/code/arenavm.c b/mps/code/arenavm.c
index 87d7a797d37..0f6f3ab47b2 100644
--- a/mps/code/arenavm.c
+++ b/mps/code/arenavm.c
@@ -1584,7 +1584,7 @@ static void VMFree(Addr base, Size size, Pool pool)
   Arena arena;
   VMArena vmArena;
   VMChunk vmChunk;
-  Chunk chunk;
+  Chunk chunk = NULL;           /* suppress "may be used uninitialized" */
   Count pages;
   Index pi, piBase, piLimit;
   Index pageTableBase;
diff --git a/mps/code/cbs.c b/mps/code/cbs.c
index df1a359e59a..c2cda567b7f 100644
--- a/mps/code/cbs.c
+++ b/mps/code/cbs.c
@@ -1561,7 +1561,7 @@ Bool CBSFindLargest(Addr *baseReturn, Addr *limitReturn,
     notEmpty = SplayRoot(&root, splayTreeOfCBS(cbs));
     if (notEmpty) {
       CBSBlock block;
-      SplayNode node;
+      SplayNode node = NULL;    /* suppress "may be used uninitialized" */
 
       size = cbsBlockOfSplayNode(root)->maxSize;
       METER_ACC(cbs->splaySearch, cbs->splayTreeSize);
diff --git a/mps/code/poolmrg.c b/mps/code/poolmrg.c
index d55f8af9f3b..397ba89b6db 100644
--- a/mps/code/poolmrg.c
+++ b/mps/code/poolmrg.c
@@ -407,7 +407,7 @@ static void MRGGuardianInit(MRG mrg, Link link, RefPart refPart)
 
 static void MRGMessageDelete(Message message)
 {
-  Pool pool;
+  Pool pool = NULL;             /* suppress "may be used uninitialized" */
   Arena arena;
   Link link;
   Bool b;