[Valgrind-developers] vex: r1866 - trunk/priv/guest-generic

[<sv...@va...>]

Author: sewardj
Date: 2008-10-23 10:47:47 +0100 (Thu, 23 Oct 2008)
New Revision: 1866

Log:
Stop gcc-4.4.0 (snapshot) complaining about strict-aliasing violations.


Modified:
   trunk/priv/guest-generic/bb_to_IR.c


Modified: trunk/priv/guest-generic/bb_to_IR.c
===================================================================
--- trunk/priv/guest-generic/bb_to_IR.c	2008-10-11 10:07:55 UTC (rev 1865)
+++ trunk/priv/guest-generic/bb_to_IR.c	2008-10-23 09:47:47 UTC (rev 1866)
@@ -376,9 +376,12 @@
      irsb->stmts[selfcheck_idx+3]
         = IRStmt_Put( offB_TILEN, IRExpr_RdTmp(tilen_tmp) );
 
-     p_adler_helper = abiinfo_both->host_ppc_calls_use_fndescrs
-                      ? ((HWord*)(&genericg_compute_adler32))[0]
-                      : (HWord)&genericg_compute_adler32;
+     if (abiinfo_both->host_ppc_calls_use_fndescrs) {
+        HWord* fndescr = (HWord*)&genericg_compute_adler32;
+        p_adler_helper = fndescr[0];
+     } else {
+        p_adler_helper = (HWord)&genericg_compute_adler32;
+     }
 
      irsb->stmts[selfcheck_idx+4]
         = IRStmt_Exit(