tree-inline.c (remap_eh_region_tree_nr): Use integer_type_node for the remapped region number.

2011-04-29  Richard Guenther  <rguenther@suse.de>

	* tree-inline.c (remap_eh_region_tree_nr): Use integer_type_node
	for the remapped region number.
	* predict.c (build_predict_expr): Use integer_type_node for the
	predict kind.
	* fold-const.c (fold_binary_loc): Use integer_type_node for
	the shift amount.  Use a proper type for the PLUS_EXPR operand.

From-SVN: r173156

gcc/ChangeLog

+2011-04-29  Richard Guenther  <rguenther@suse.de>
+
+	* tree-inline.c (remap_eh_region_tree_nr): Use integer_type_node
+	for the remapped region number.
+	* predict.c (build_predict_expr): Use integer_type_node for the
+	predict kind.
+	* fold-const.c (fold_binary_loc): Use integer_type_node for
+	the shift amount.  Use a proper type for the PLUS_EXPR operand.
+
 2011-04-29  Michael Matz  <matz@suse.de>
 
 	* lto-streamer.c (lto_streamer_cache_insert_1): Accept to override

gcc/fold-const.c

@@ -11533,7 +11533,7 @@ fold_binary_loc (location_t loc,
 
 	    return fold_build2_loc (loc, RSHIFT_EXPR, type,
 			  TREE_OPERAND (arg0, 0),
-			  build_int_cst (NULL_TREE, pow2));
+			  build_int_cst (integer_type_node, pow2));
 	  }
 	}
 
@@ -11565,7 +11565,9 @@ fold_binary_loc (location_t loc,
 				       WARN_STRICT_OVERFLOW_MISC);
 
 	      sh_cnt = fold_build2_loc (loc, PLUS_EXPR, TREE_TYPE (sh_cnt),
-				    sh_cnt, build_int_cst (NULL_TREE, pow2));
+					sh_cnt,
+					build_int_cst (TREE_TYPE (sh_cnt),
+						       pow2));
 	      return fold_build2_loc (loc, RSHIFT_EXPR, type,
 				  fold_convert_loc (loc, type, arg0), sh_cnt);
 	    }

gcc/predict.c

@@ -2291,7 +2291,7 @@ tree
 build_predict_expr (enum br_predictor predictor, enum prediction taken)
 {
   tree t = build1 (PREDICT_EXPR, void_type_node,
-		   build_int_cst (NULL, predictor));
+		   build_int_cst (integer_type_node, predictor));
   SET_PREDICT_EXPR_OUTCOME (t, taken);
   return t;
 }

gcc/tree-inline.c

@@ -1204,7 +1204,7 @@ remap_eh_region_tree_nr (tree old_t_nr, copy_body_data *id)
   old_nr = tree_low_cst (old_t_nr, 0);
   new_nr = remap_eh_region_nr (old_nr, id);
 
-  return build_int_cst (NULL, new_nr);
+  return build_int_cst (integer_type_node, new_nr);
 }
 
 /* Helper for copy_bb.  Remap statement STMT using the inlining