This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Merge some trivial changes from lto


This reduces the noise in the lto to trunk diff by merging lto
unrelated changes.  As opposed to the unrelated changes I reverted
on the branch I consider these useful.

I'm considering the changes as obvious and am going to apply them tomorrow
if there are no complaints.

Bootstrapped and tested on x86_64-unknown-linux-gnu.

Thanks,
Richard.

2009-08-26  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.

Index: gcc/gengtype.c
===================================================================
*** gcc/gengtype.c.orig	2009-08-20 18:08:09.000000000 +0200
--- gcc/gengtype.c	2009-08-26 14:23:56.000000000 +0200
*************** main (int argc, char **argv)
*** 3671,3676 ****
--- 3671,3677 ----
    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++;
Index: gcc/cp/class.c
===================================================================
*** gcc/cp/class.c.orig	2009-08-25 15:15:01.000000000 +0200
--- gcc/cp/class.c	2009-08-26 14:23:56.000000000 +0200
*************** build_vtbl_ref_1 (tree instance, tree id
*** 624,630 ****
    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);
  
--- 624,629 ----
Index: gcc/cp/Make-lang.in
===================================================================
*** gcc/cp/Make-lang.in.orig	2009-07-17 17:45:15.000000000 +0200
--- gcc/cp/Make-lang.in	2009-08-26 14:23:56.000000000 +0200
*************** c++.stagefeedback: stagefeedback-start
*** 240,246 ****
  #
  # .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) \
  	$(SYSTEM_H) coretypes.h $(CONFIG_H) $(TARGET_H) $(GGC_H) \
  	$(srcdir)/../include/hashtab.h $(srcdir)/../include/splay-tree.h
  
--- 240,246 ----
  #
  # .o: .h dependencies.
  CXX_TREE_H = $(TREE_H) cp/name-lookup.h cp/cp-tree.h $(C_COMMON_H) \
! 	$(FUNCTION_H) $(VARRAY_H) \
  	$(SYSTEM_H) coretypes.h $(CONFIG_H) $(TARGET_H) $(GGC_H) \
  	$(srcdir)/../include/hashtab.h $(srcdir)/../include/splay-tree.h
  
Index: gcc/cp/semantics.c
===================================================================
*** gcc/cp/semantics.c.orig	2009-08-03 10:50:19.000000000 +0200
--- gcc/cp/semantics.c	2009-08-26 14:23:56.000000000 +0200
*************** expand_or_defer_fn (tree fn)
*** 3239,3244 ****
--- 3239,3245 ----
        /* 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;
      }
  
Index: gcc/ipa-utils.c
===================================================================
*** gcc/ipa-utils.c.orig	2009-05-04 11:09:18.000000000 +0200
--- gcc/ipa-utils.c	2009-08-26 14:23:56.000000000 +0200
*************** ipa_utils_reduced_inorder (struct cgraph
*** 215,221 ****
  tree
  get_base_var (tree t)
  {
!   if ((TREE_CODE (t) == EXC_PTR_EXPR) || (TREE_CODE (t) == FILTER_EXPR))
      return t;
  
    while (!SSA_VAR_P (t) 
--- 215,222 ----
  tree
  get_base_var (tree t)
  {
!   if (TREE_CODE (t) == EXC_PTR_EXPR
!       || TREE_CODE (t) == FILTER_EXPR)
      return t;
  
    while (!SSA_VAR_P (t) 
Index: gcc/tree-ssa-live.c
===================================================================
*** gcc/tree-ssa-live.c.orig	2009-07-02 12:17:31.000000000 +0200
--- gcc/tree-ssa-live.c	2009-08-26 14:23:56.000000000 +0200
*************** dump_scope_block (FILE *file, int indent
*** 637,642 ****
--- 637,651 ----
    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.  */
Index: gcc/tree-ssa-copy.c
===================================================================
*** gcc/tree-ssa-copy.c.orig	2009-07-17 11:07:20.000000000 +0200
--- gcc/tree-ssa-copy.c	2009-08-26 14:23:56.000000000 +0200
*************** replace_exp_1 (use_operand_p op_p, tree
*** 162,167 ****
--- 162,168 ----
  {
  #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
Index: gcc/basic-block.h
===================================================================
*** gcc/basic-block.h.orig	2009-07-08 14:39:39.000000000 +0200
--- gcc/basic-block.h	2009-08-26 14:23:56.000000000 +0200
*************** enum dom_state
*** 360,366 ****
  };
  
  /* What sort of profiling information we have.  */
! enum profile_status
  {
    PROFILE_ABSENT,
    PROFILE_GUESSED,
--- 360,366 ----
  };
  
  /* What sort of profiling information we have.  */
! enum profile_status_d
  {
    PROFILE_ABSENT,
    PROFILE_GUESSED,
*************** struct GTY(()) control_flow_graph {
*** 393,399 ****
       only used for the gimple CFG.  */
    VEC(basic_block,gc) *x_label_to_block_map;
  
!   enum profile_status x_profile_status;
  
    /* Whether the dominators and the postdominators are available.  */
    enum dom_state x_dom_computed[2];
--- 393,399 ----
       only used for the gimple CFG.  */
    VEC(basic_block,gc) *x_label_to_block_map;
  
!   enum profile_status_d x_profile_status;
  
    /* Whether the dominators and the postdominators are available.  */
    enum dom_state x_dom_computed[2];
Index: gcc/tree-flow.h
===================================================================
*** gcc/tree-flow.h.orig	2009-08-12 19:54:06.000000000 +0200
--- gcc/tree-flow.h	2009-08-26 14:29:52.000000000 +0200
*************** void mark_addressable (tree);
*** 896,901 ****
--- 896,902 ----
  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  */
  


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]