From: Richard Biener <rguenther@suse.de>
Date: Tue, 15 Apr 2014 08:08:06 +0000 (+0000)
Subject: tree.c (iterative_hash_expr): Use enum tree_code_class to store TREE_CODE_CLASS.
X-Git-Tag: releases/gcc-5.1.0~8120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=349e6210992cfb731e1df69c2651cce95b7a19e9;p=thirdparty%2Fgcc.git

tree.c (iterative_hash_expr): Use enum tree_code_class to store TREE_CODE_CLASS.

2014-04-15  Richard Biener  <rguenther@suse.de>

	* tree.c (iterative_hash_expr): Use enum tree_code_class
	to store TREE_CODE_CLASS.
	(tree_block): Likewise.
	(tree_set_block): Likewise.
	* tree.h (fold_build_pointer_plus_loc): Use
	convert_to_ptrofftype_loc.

From-SVN: r209406
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2fbdb01931d0..3732bd2b1761 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-15  Richard Biener  <rguenther@suse.de>
+
+	* tree.c (iterative_hash_expr): Use enum tree_code_class
+	to store TREE_CODE_CLASS.
+	(tree_block): Likewise.
+	(tree_set_block): Likewise.
+	* tree.h (fold_build_pointer_plus_loc): Use
+	convert_to_ptrofftype_loc.
+
 2014-04-15  Jakub Jelinek  <jakub@redhat.com>
 
 	PR plugins/59335
diff --git a/gcc/tree.c b/gcc/tree.c
index f42a0b7d889c..d829faaddb9f 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -7387,7 +7387,7 @@ iterative_hash_expr (const_tree t, hashval_t val)
 {
   int i;
   enum tree_code code;
-  char tclass;
+  enum tree_code_class tclass;
 
   if (t == NULL_TREE)
     return iterative_hash_hashval_t (0, val);
@@ -11224,7 +11224,7 @@ walk_tree_without_duplicates_1 (tree *tp, walk_tree_fn func, void *data,
 tree
 tree_block (tree t)
 {
-  char const c = TREE_CODE_CLASS (TREE_CODE (t));
+  const enum tree_code_class c = TREE_CODE_CLASS (TREE_CODE (t));
 
   if (IS_EXPR_CODE_CLASS (c))
     return LOCATION_BLOCK (t->exp.locus);
@@ -11235,7 +11235,7 @@ tree_block (tree t)
 void
 tree_set_block (tree t, tree b)
 {
-  char const c = TREE_CODE_CLASS (TREE_CODE (t));
+  const enum tree_code_class c = TREE_CODE_CLASS (TREE_CODE (t));
 
   if (IS_EXPR_CODE_CLASS (c))
     {
diff --git a/gcc/tree.h b/gcc/tree.h
index 2f8f85ff93cc..9ad0b6fdd9ff 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -4192,7 +4192,7 @@ static inline tree
 fold_build_pointer_plus_loc (location_t loc, tree ptr, tree off)
 {
   return fold_build2_loc (loc, POINTER_PLUS_EXPR, TREE_TYPE (ptr),
-			  ptr, fold_convert_loc (loc, sizetype, off));
+			  ptr, convert_to_ptrofftype_loc (loc, off));
 }
 #define fold_build_pointer_plus(p,o) \
 	fold_build_pointer_plus_loc (UNKNOWN_LOCATION, p, o)