backport: re PR tree-optimization/51118 (ICE: tree check: expected tree that contains...

	Backport from mainline:
	2011-11-18  Uros Bizjak  <ubizjak@gmail.com>

	PR tree-optimization/51118
	* fold-const.c (fold_checksum_tree): Check for TS_TYPED structure
	before using TREE_TYPE accessor on expr.

From-SVN: r183864

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f2816c4caaa81b10858f43a9eb04f6f0cf16eef8..2ff3b717ac0872dea80aabf8a69a429f4a182941 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-02  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline:
+       2011-11-18  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR tree-optimization/51118
+       * fold-const.c (fold_checksum_tree): Check for TS_TYPED structure
+       before using TREE_TYPE accessor on expr.
+
 2012-01-12  Georg-Johann Lay  <avr@gjlay.de>
 
        Backport from mainline r183796
@@ -30,7 +39,7 @@
 2012-01-30  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
 
        Backport from mainline.
-        2012-01-20  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
+       2012-01-20  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
 
        PR target/50313
        * config/arm/arm.c (arm_load_pic_register): Use

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 51be79dfd0be99ba6d488b18e942dd9a3792d2a8..c6b5f5d8d0ae01f284345c485e9dacf4dc16a047 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -13784,7 +13784,8 @@ recursive_label:
        }
     }
   md5_process_bytes (expr, tree_size (expr), ctx);
-  fold_checksum_tree (TREE_TYPE (expr), ctx, ht);
+  if (CODE_CONTAINS_STRUCT (code, TS_TYPED))
+    fold_checksum_tree (TREE_TYPE (expr), ctx, ht);
   if (TREE_CODE_CLASS (code) != tcc_type
       && TREE_CODE_CLASS (code) != tcc_declaration
       && code != TREE_LIST