[pph] Initialize cache_ix in all paths in pph_start_record (issue4642045)

Message ID 20110617224918.BA4771C1E31@gchare.mtv.corp.google.com
State New
Headers show

Commit Message

Gab Charette June 17, 2011, 10:49 p.m.
Read the comment in the diff for all the details.

I found this while working on my current patch, adding some assertion at the
end of the function would create a new build error and moving it around in the
function would stop showing the error.

I discussed this with Collin and Jeff and it appears that the compiler
changes it's inlining decisions based on very picky details. In this particular
case, inlining the function resulted in an error.

Tested with bootstrap build and pph regression testing.

2011-06-17  Gabriel Charette  <gchare@google.com>

	* gcc/cp/pph-streamer-in.c (pph_start_record):
	Initialize cache_ix in all paths.

This patch is available for review at http://codereview.appspot.com/4642045


diff --git a/gcc/cp/pph-streamer-in.c b/gcc/cp/pph-streamer-in.c
index b3c2ac9..186100f 100644
--- a/gcc/cp/pph-streamer-in.c
+++ b/gcc/cp/pph-streamer-in.c
@@ -204,7 +204,15 @@  pph_start_record (pph_stream *stream, unsigned *cache_ix)
   if (marker == PPH_RECORD_START || marker == PPH_RECORD_SHARED)
     *cache_ix = pph_in_uint (stream);
-    gcc_assert (marker == PPH_RECORD_END);
+    {
+      gcc_assert (marker == PPH_RECORD_END);
+      /* Initialize CACHE_IX to an invalid index. Even though this
+	 is never used in practice, the compiler will throw an error
+	 if the optimizer inlines this function and discards the asserts
+	 in a given build as it will complain that " 'ix' may be used
+	 unititialized".  */
+      *cache_ix = -1;
+    }
   return marker;