Patchwork Fix --enable-checking=fold bootstrap (PR bootstrap/45686)

login
register
mail settings
Submitter Jakub Jelinek
Date Sept. 16, 2010, 9:38 a.m.
Message ID <20100916093846.GQ1269@tyan-ft48-01.lab.bos.redhat.com>
Download mbox | patch
Permalink /patch/64956/
State New
Headers show

Comments

Jakub Jelinek - Sept. 16, 2010, 9:38 a.m.
Hi!

-Wcast-qual complains about (const void **) htab_find_slot () cast,
fixed thusly, bootstrapped with --enable-checking=yes,fold
- --enable-languages=c on x86-64-linux, committed to trunk as obvious.

2010-09-16  Jakub Jelinek  <jakub@redhat.com>

	PR bootstrap/45686
	* fold-const.c (fold_checksum_tree): Change slot from const void **
	to void **, use CONST_CAST_TREE to store into *slot.


	Jakub

Patch

--- gcc/fold-const.c.jj	2010-09-09 00:21:04.000000000 +0200
+++ gcc/fold-const.c	2010-09-16 11:05:27.452614712 +0200
@@ -13648,7 +13648,7 @@  fold_check_failed (const_tree expr ATTRI
 static void
 fold_checksum_tree (const_tree expr, struct md5_ctx *ctx, htab_t ht)
 {
-  const void **slot;
+  void **slot;
   enum tree_code code;
   union tree_node buf;
   int i, len;
@@ -13660,10 +13660,10 @@  recursive_label:
 	      && sizeof (struct tree_type) <= sizeof (struct tree_function_decl));
   if (expr == NULL)
     return;
-  slot = (const void **) htab_find_slot (ht, expr, INSERT);
+  slot = (void **) htab_find_slot (ht, expr, INSERT);
   if (*slot != NULL)
     return;
-  *slot = expr;
+  *slot = CONST_CAST_TREE (expr);
   code = TREE_CODE (expr);
   if (TREE_CODE_CLASS (code) == tcc_declaration
       && DECL_ASSEMBLER_NAME_SET_P (expr))