2009-08-27 Richard Guenther <rguenther@suse.de>

	* gengtype.c (main): Handle uint64_t.
	* ipa-utils.c (get_base_var): Indent properly.
	* tree-ssa-live.c (debug_scope_block): New function.
	* tree-flow.h (debug_scope_block): Declare.
	* tree-ssa-copy.c (replace_exp_1): Add vertical space.
	* basic-block.h (enum profile_status): Rename to
	enum profile_status_d.
	(x_profile_status): Adjust type.

	cp/
	* class.c (build_vtbl_ref_1): Remove excess vertical space.
	* Make-lang.in (CXX_TREE_H): Remove c-common.def dependency
	tracked by $(TREE_H).
	* semantics.c (expand_or_defer_fn): Zero DECL_SAVED_TREE.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151139 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 36 insertions, 5 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 95800ceddcd..c6233a9b7c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2009-08-27  Richard Guenther  <rguenther@suse.de>
+
+	* gengtype.c (main): Handle uint64_t.
+	* ipa-utils.c (get_base_var): Indent properly.
+	* tree-ssa-live.c (debug_scope_block): New function.
+	* tree-flow.h (debug_scope_block): Declare.
+	* tree-ssa-copy.c (replace_exp_1): Add vertical space.
+	* basic-block.h (enum profile_status): Rename to
+	enum profile_status_d.
+	(x_profile_status): Adjust type.
+
 2009-08-27  Dodji Seketeli  <dodji@redhat.com>
 
 	PR debug/41770
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 12256a23f07..2cc3e91daa2 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -360,7 +360,7 @@ enum dom_state
 };
 
 /* What sort of profiling information we have.  */
-enum profile_status
+enum profile_status_d
 {
   PROFILE_ABSENT,
   PROFILE_GUESSED,
@@ -393,7 +393,7 @@ struct GTY(()) control_flow_graph {
      only used for the gimple CFG.  */
   VEC(basic_block,gc) *x_label_to_block_map;
 
-  enum profile_status x_profile_status;
+  enum profile_status_d x_profile_status;
 
   /* Whether the dominators and the postdominators are available.  */
   enum dom_state x_dom_computed[2];
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1bd31857e3b..bb5a61520d6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-27  Richard Guenther  <rguenther@suse.de>
+
+	* class.c (build_vtbl_ref_1): Remove excess vertical space.
+	* Make-lang.in (CXX_TREE_H): Remove c-common.def dependency
+	tracked by $(TREE_H).
+	* semantics.c (expand_or_defer_fn): Zero DECL_SAVED_TREE.
+
 2009-08-26  Jason Merrill  <jason@redhat.com>
 
 	* call.c (build_builtin_candidate): Don't set LOOKUP_ONLYCONVERTING
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index c7d1a449a90..a3190f4aa53 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -240,7 +240,7 @@ c++.stagefeedback: stagefeedback-start
 #
 # .o: .h dependencies.
 CXX_TREE_H = $(TREE_H) cp/name-lookup.h cp/cp-tree.h $(C_COMMON_H) \
-	c-common.def $(FUNCTION_H) $(VARRAY_H) \
+	$(FUNCTION_H) $(VARRAY_H) \
 	$(SYSTEM_H) coretypes.h $(CONFIG_H) $(TARGET_H) $(GGC_H) \
 	$(srcdir)/../include/hashtab.h $(srcdir)/../include/splay-tree.h
 
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 694d2628baa..2c308cfb5c9 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -624,7 +624,6 @@ build_vtbl_ref_1 (tree instance, tree idx)
   if (!vtbl)
     vtbl = build_vfield_ref (instance, basetype);
 
-
   aref = build_array_ref (input_location, vtbl, idx);
   TREE_CONSTANT (aref) |= TREE_CONSTANT (vtbl) && TREE_CONSTANT (idx);
 
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 23db8321431..1c16b72e8d5 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3239,6 +3239,7 @@ expand_or_defer_fn (tree fn)
       /* We don't want to process FN again, so pretend we've written
 	 it out, even though we haven't.  */
       TREE_ASM_WRITTEN (fn) = 1;
+      DECL_SAVED_TREE (fn) = NULL_TREE;
       return;
     }
 
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 7bc6a9e413d..1a2f38bd8b5 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -3671,6 +3671,7 @@ main (int argc, char **argv)
   do_scalar_typedef ("REAL_VALUE_TYPE", &pos); pos.line++;
   do_scalar_typedef ("FIXED_VALUE_TYPE", &pos); pos.line++;
   do_scalar_typedef ("double_int", &pos); pos.line++;
+  do_scalar_typedef ("uint64_t", &pos); pos.line++;
   do_scalar_typedef ("uint8", &pos); pos.line++;
   do_scalar_typedef ("jword", &pos); pos.line++;
   do_scalar_typedef ("JCF_u2", &pos); pos.line++;
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index 5bd0b788cd1..a001916fb00 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -215,7 +215,8 @@ ipa_utils_reduced_inorder (struct cgraph_node **order,
 tree
 get_base_var (tree t)
 {
-  if ((TREE_CODE (t) == EXC_PTR_EXPR) || (TREE_CODE (t) == FILTER_EXPR))
+  if (TREE_CODE (t) == EXC_PTR_EXPR
+      || TREE_CODE (t) == FILTER_EXPR)
     return t;
 
   while (!SSA_VAR_P (t) 
diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index ff2b52bd8c0..720180c4eb3 100644
--- a/gcc/tree-flow.h
+++ b/gcc/tree-flow.h
@@ -896,6 +896,7 @@ void mark_addressable (tree);
 extern void remove_unused_locals (void);
 extern void dump_scope_blocks (FILE *, int);
 extern void debug_scope_blocks (int);
+extern void debug_scope_block (tree, int);
 
 /* In tree-ssa-address.c  */
 
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index ea0291c49c5..6bc3c13d4bb 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -162,6 +162,7 @@ replace_exp_1 (use_operand_p op_p, tree val,
 {
 #if defined ENABLE_CHECKING
   tree op = USE_FROM_PTR (op_p);
+
   gcc_assert (!(for_propagation
 		&& TREE_CODE (op) == SSA_NAME
 		&& TREE_CODE (val) == SSA_NAME
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index d4166944e97..6de001c8ac3 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -637,6 +637,15 @@ dump_scope_block (FILE *file, int indent, tree scope, int flags)
   fprintf (file, "\n%*s}\n",indent, "");
 }
 
+/* Dump the tree of lexical scopes starting at SCOPE to stderr.  FLAGS
+   is as in print_generic_expr.  */
+
+void
+debug_scope_block (tree scope, int flags)
+{
+  dump_scope_block (stderr, 0, scope, flags);
+}
+
 
 /* Dump the tree of lexical scopes of current_function_decl to FILE.
    FLAGS is as in print_generic_expr.  */