diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/Makefile.in | 2 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 29 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 62 | ||||
| -rw-r--r-- | gcc/cp/call.c | 2 | ||||
| -rw-r--r-- | gcc/cp/class.c | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 5 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 3 | ||||
| -rw-r--r-- | gcc/cp/except.c | 3 | ||||
| -rw-r--r-- | gcc/cp/expr.c | 2 | ||||
| -rw-r--r-- | gcc/cp/friend.c | 2 | ||||
| -rw-r--r-- | gcc/cp/init.c | 2 | ||||
| -rw-r--r-- | gcc/cp/method.c | 4 | ||||
| -rw-r--r-- | gcc/cp/optimize.c | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 12 | ||||
| -rw-r--r-- | gcc/cp/search.c | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 5 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 5 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 3 | ||||
| -rw-r--r-- | gcc/objc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/objc/Make-lang.in | 9 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 9 | ||||
| -rw-r--r-- | gcc/objc/objc-act.h | 3 | ||||
| -rw-r--r-- | gcc/objc/objc-lang.c | 1 | ||||
| -rw-r--r-- | gcc/objcp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/objcp/Make-lang.in | 11 | ||||
| -rw-r--r-- | gcc/objcp/objcp-decl.c | 11 | ||||
| -rw-r--r-- | gcc/objcp/objcp-lang.c | 5 |
29 files changed, 112 insertions, 112 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c52247a..0b511f5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2010-05-25 Steven Bosscher <steven@gcc.gnu.org> + + * Makefile.in (EXCEPT_H): Fix typo. + 2010-05-25 Vladimir Makarov <vmakarov@redhat.com> * ira-build.c (update_conflict_hard_reg_costs): New. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index f9926fa..f9720e3 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -858,7 +858,7 @@ REVISION_s := "\"\"" endif # Shorthand variables for dependency lists. -EXCEPT_H = except.h $(HASHTAB_) vecprim.h vecir.h +EXCEPT_H = except.h $(HASHTAB_H) vecprim.h vecir.h TOPLEV_H = toplev.h $(INPUT_H) bversion.h TARGET_H = $(TM_H) target.h insn-modes.h MACHMODE_H = machmode.h mode-classes.def insn-modes.h diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 15807ce..ea49282 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,32 @@ +2010-05-25 Steven Bosscher <steven@gcc.gnu.org> + + * cp-tree.h: Do not include splay-tree.h. + (struct prtmem_cst): Remove unused field and false comment. + * typeck.c: Do not include rtl.h, expr.h, and tm_p.h. + * optimize.c: Do not inclde rtl.h, insn-config.h, and integrate.h. + * init.c: Do not include rtl.h and expr.h. + * class.c: Do not include rtl.h. Include splay-tree.h. + (build_clone): Use plain NULL instead of NULL_RTX. + * decl.c: Do not include expr.h. Explain why rtl.h has to be + included. Include splay-tree.h. + * method.c: Do not include rtl.h and expr.h. + (use_thunk): Use plain NULL instead of NULL_RTX. + * except.c: Do not include rtl.h, expr.h, and libfuncs.h. + * tree.c: Do not include rtl.h, insn-config.h, integrate.h, + and target.h. Include splay-tree.h. + * expr.c: Do not include rtl.h and expr.h. + * pt.c: Do not include obstack.h and rtl.h. + (tsubst_friend_function): Use plain NULL instead of NULL_RTX. + (tsubst_decl): Likewise. + (instantiate_decl): Likewise. + * semantics.c: Do not include exprt.h and debug.h. Explain why + rtl.h has to be included. + * decl2.c: Do not include rtl.h and expr.h. Include splay-tree.h. + * call.c: Do not include rtl.h and expr.h. + * search.c: Do not include obstack.h and rtl.h. + * friend.c: Do not include rtl.h and expr.h. + * Make-lang.in: Update dependencies. + 2010-05-25 Jakub Jelinek <jakub@redhat.com> PR c++/18249 diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index c4f553e..7a85212 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -243,7 +243,7 @@ c++.stagefeedback: stagefeedback-start CXX_TREE_H = $(TREE_H) cp/name-lookup.h cp/cp-tree.h $(C_COMMON_H) \ $(FUNCTION_H) \ $(SYSTEM_H) coretypes.h $(CONFIG_H) $(TARGET_H) $(GGC_H) \ - $(srcdir)/../include/hashtab.h $(srcdir)/../include/splay-tree.h + $(srcdir)/../include/hashtab.h CXX_PRETTY_PRINT_H = cp/cxx-pretty-print.h $(C_PRETTY_PRINT_H) @@ -253,60 +253,62 @@ cp/cp-lang.o: cp/cp-lang.c $(CXX_TREE_H) $(TM_H) toplev.h debug.h langhooks.h \ $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-cp.h gt-cp-cp-lang.h \ $(DIAGNOSTIC_H) cp/cp-objcp-common.h $(EXPR_H) $(EXCEPT_H) cp/decl.o: cp/decl.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) cp/decl.h \ - output.h $(EXPR_H) except.h toplev.h $(HASHTAB_H) $(RTL_H) \ + output.h $(EXCEPT_H) toplev.h $(HASHTAB_H) $(RTL_H) \ cp/operators.def $(TM_P_H) $(TREE_INLINE_H) $(DIAGNOSTIC_H) $(C_PRAGMA_H) \ debug.h gt-cp-decl.h $(TIMEVAR_H) $(TREE_FLOW_H) $(TARGET_H) $(PLUGIN_H) \ - intl.h tree-iterator.h -cp/decl2.o: cp/decl2.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) cp/decl.h $(EXPR_H) \ - output.h except.h toplev.h $(RTL_H) $(C_COMMON_H) gt-cp-decl2.h $(CGRAPH_H) \ - $(C_PRAGMA_H) $(TREE_DUMP_H) intl.h $(TARGET_H) $(GIMPLE_H) $(POINTER_SET_H) + intl.h tree-iterator.h $(SPLAY_TREE_H) +cp/decl2.o: cp/decl2.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) cp/decl.h \ + output.h $(EXCEPT_H) toplev.h $(C_COMMON_H) gt-cp-decl2.h $(CGRAPH_H) \ + $(C_PRAGMA_H) $(TREE_DUMP_H) intl.h $(TARGET_H) $(GIMPLE_H) $(POINTER_SET_H) \ + $(SPLAY_TREE_H) cp/cp-objcp-common.o : cp/cp-objcp-common.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TREE_H) $(CXX_TREE_H) $(C_COMMON_H) toplev.h \ langhooks.h $(LANGHOOKS_DEF_H) $(DIAGNOSTIC_H) debug.h \ $(CXX_PRETTY_PRINT_H) cp/cp-objcp-common.h gt-cp-cp-objcp-common.h cp/typeck2.o: cp/typeck2.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h output.h \ $(TM_P_H) $(DIAGNOSTIC_H) gt-cp-typeck2.h $(REAL_H) intl.h -cp/typeck.o: cp/typeck.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(RTL_H) $(EXPR_H) \ - toplev.h $(DIAGNOSTIC_H) convert.h $(C_COMMON_H) $(TARGET_H) -cp/class.o: cp/class.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h $(RTL_H) \ - $(TARGET_H) convert.h $(CGRAPH_H) $(TREE_DUMP_H) gt-cp-class.h -cp/call.o: cp/call.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h $(RTL_H) \ - $(EXPR_H) $(DIAGNOSTIC_H) intl.h gt-cp-call.h convert.h $(TARGET_H) langhooks.h -cp/friend.o: cp/friend.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(RTL_H) toplev.h \ - $(EXPR_H) -cp/init.o: cp/init.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(RTL_H) $(EXPR_H) \ - toplev.h except.h $(TARGET_H) -cp/method.o: cp/method.c $(CXX_TREE_H) $(TM_H) toplev.h $(RTL_H) $(EXPR_H) \ +cp/typeck.o: cp/typeck.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) \ + toplev.h $(DIAGNOSTIC_H) convert.h $(C_COMMON_H) $(TARGET_H) \ + output.h toplev.h +cp/class.o: cp/class.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ + $(TARGET_H) convert.h $(CGRAPH_H) $(TREE_DUMP_H) gt-cp-class.h \ + $(SPLAY_TREE_H) +cp/call.o: cp/call.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ + $(DIAGNOSTIC_H) intl.h gt-cp-call.h convert.h $(TARGET_H) langhooks.h +cp/friend.o: cp/friend.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h +cp/init.o: cp/init.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) \ + toplev.h $(EXCEPT_H) $(TARGET_H) +cp/method.o: cp/method.c $(CXX_TREE_H) $(TM_H) toplev.h \ $(TM_P_H) $(TARGET_H) $(DIAGNOSTIC_H) gt-cp-method.h $(GIMPLE_H) cp/cvt.o: cp/cvt.c $(CXX_TREE_H) $(TM_H) cp/decl.h $(FLAGS_H) toplev.h \ convert.h $(TARGET_H) intl.h -cp/search.o: cp/search.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h $(RTL_H) \ +cp/search.o: cp/search.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ intl.h -cp/tree.o: cp/tree.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h $(RTL_H) \ - insn-config.h $(INTEGRATE_H) $(TREE_INLINE_H) $(REAL_H) gt-cp-tree.h \ - $(TARGET_H) debug.h $(TREE_FLOW_H) $(CGRAPH_H) +cp/tree.o: cp/tree.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ + $(TREE_INLINE_H) $(REAL_H) gt-cp-tree.h \ + $(TARGET_H) debug.h $(TREE_FLOW_H) $(CGRAPH_H) $(SPLAY_TREE_H) cp/ptree.o: cp/ptree.c $(CXX_TREE_H) $(TM_H) cp/rtti.o: cp/rtti.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h convert.h \ $(TARGET_H) $(C_PRAGMA_H) gt-cp-rtti.h intl.h -cp/except.o: cp/except.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(RTL_H) except.h \ - toplev.h cp/cfns.h $(EXPR_H) libfuncs.h $(TREE_INLINE_H) $(TARGET_H) -cp/expr.o: cp/expr.c $(CXX_TREE_H) $(TM_H) $(RTL_H) $(FLAGS_H) $(EXPR_H) \ - toplev.h except.h $(TM_P_H) +cp/except.o: cp/except.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(EXCEPT_H) \ + toplev.h cp/cfns.h $(TREE_INLINE_H) $(TARGET_H) +cp/expr.o: cp/expr.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) \ + toplev.h $(EXCEPT_H) $(TM_P_H) cp/pt.o: cp/pt.c $(CXX_TREE_H) $(TM_H) cp/decl.h cp/cp-objcp-common.h \ - toplev.h $(RTL_H) except.h $(TREE_INLINE_H) pointer-set.h gt-cp-pt.h \ + toplev.h $(EXCEPT_H) $(TREE_INLINE_H) pointer-set.h gt-cp-pt.h \ vecprim.h intl.h cp/error.o: cp/error.c $(CXX_TREE_H) $(TM_H) toplev.h $(DIAGNOSTIC_H) \ $(FLAGS_H) $(REAL_H) $(LANGHOOKS_DEF_H) $(CXX_PRETTY_PRINT_H) \ tree-diagnostic.h tree-pretty-print.h cp/repo.o: cp/repo.c $(CXX_TREE_H) $(TM_H) toplev.h $(DIAGNOSTIC_H) \ gt-cp-repo.h -cp/semantics.o: cp/semantics.c $(CXX_TREE_H) $(TM_H) except.h toplev.h \ - $(FLAGS_H) debug.h output.h $(RTL_H) $(TIMEVAR_H) $(EXPR_H) \ +cp/semantics.o: cp/semantics.c $(CXX_TREE_H) $(TM_H) $(EXCEPT_H) toplev.h \ + $(FLAGS_H) output.h $(RTL_H) $(TIMEVAR_H) \ $(TREE_INLINE_H) $(CGRAPH_H) $(TARGET_H) $(C_COMMON_H) $(GIMPLE_H) \ bitmap.h gt-cp-semantics.h cp/dump.o: cp/dump.c $(CXX_TREE_H) $(TM_H) $(TREE_DUMP_H) -cp/optimize.o: cp/optimize.c $(CXX_TREE_H) $(TM_H) rtl.h $(INTEGRATE_H) \ - insn-config.h input.h $(PARAMS_H) debug.h $(TREE_INLINE_H) $(GIMPLE_H) \ +cp/optimize.o: cp/optimize.c $(CXX_TREE_H) $(TM_H) \ + input.h $(PARAMS_H) debug.h $(TREE_INLINE_H) $(GIMPLE_H) \ $(TARGET_H) tree-iterator.h $(CGRAPH_H) cp/mangle.o: cp/mangle.c $(CXX_TREE_H) $(TM_H) toplev.h $(REAL_H) \ gt-cp-mangle.h $(TARGET_H) $(TM_P_H) $(CGRAPH_H) diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 890ab88..76fec59 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -32,9 +32,7 @@ along with GCC; see the file COPYING3. If not see #include "cp-tree.h" #include "output.h" #include "flags.h" -#include "rtl.h" #include "toplev.h" -#include "expr.h" #include "diagnostic.h" #include "intl.h" #include "target.h" diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 748e1b3..523f401 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -30,13 +30,13 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "cp-tree.h" #include "flags.h" -#include "rtl.h" #include "output.h" #include "toplev.h" #include "target.h" #include "convert.h" #include "cgraph.h" #include "tree-dump.h" +#include "splay-tree.h" /* The number of nested classes being processed. If we are not in the scope of any class, this is zero. */ @@ -3955,7 +3955,7 @@ build_clone (tree fn, tree name) } /* Create the RTL for this function. */ - SET_DECL_RTL (clone, NULL_RTX); + SET_DECL_RTL (clone, NULL); rest_of_decl_compilation (clone, /*top_level=*/1, at_eof); if (pch_file) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 3e1b310..3128ad3 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see #include "ggc.h" #include "function.h" #include "hashtab.h" -#include "splay-tree.h" #include "vec.h" #include "c-common.h" #include "name-lookup.h" @@ -244,9 +243,6 @@ typedef struct template_parm_index_s template_parm_index; struct GTY(()) ptrmem_cst { struct tree_common common; - /* This isn't used, but the middle-end expects all constants to have - this field. */ - rtx rtl; tree member; }; typedef struct ptrmem_cst * ptrmem_cst_t; diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5420f71..41bb5bc 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -33,8 +33,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "expr.h" #include "flags.h" #include "cp-tree.h" #include "tree-iterator.h" @@ -55,8 +53,11 @@ along with GCC; see the file COPYING3. If not see #include "timevar.h" #include "tree-flow.h" #include "pointer-set.h" +#include "splay-tree.h" #include "plugin.h" +#include "rtl.h" /* For decl_default_tls_model. */ + static tree grokparms (tree parmlist, tree *); static const char *redeclaration_error_message (tree, tree); diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 2fd6305..0313101 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -33,8 +33,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "expr.h" #include "flags.h" #include "cp-tree.h" #include "decl.h" @@ -53,6 +51,7 @@ along with GCC; see the file COPYING3. If not see #include "intl.h" #include "gimple.h" #include "pointer-set.h" +#include "splay-tree.h" extern cpp_reader *parse_in; diff --git a/gcc/cp/except.c b/gcc/cp/except.c index c0867ef..de49095 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -28,9 +28,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "expr.h" -#include "libfuncs.h" #include "cp-tree.h" #include "flags.h" #include "output.h" diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c index a42e06b..ef5d6be 100644 --- a/gcc/cp/expr.c +++ b/gcc/cp/expr.c @@ -24,10 +24,8 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "rtl.h" #include "tree.h" #include "flags.h" -#include "expr.h" #include "cp-tree.h" #include "toplev.h" #include "except.h" diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index 03748fe..7bc11c7 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -23,8 +23,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "expr.h" #include "cp-tree.h" #include "flags.h" #include "output.h" diff --git a/gcc/cp/init.c b/gcc/cp/init.c index bf80c09..3e56417 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -27,8 +27,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "expr.h" #include "cp-tree.h" #include "flags.h" #include "output.h" diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 43b84dd..124a83c 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -29,8 +29,6 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "tree.h" #include "cp-tree.h" -#include "rtl.h" -#include "expr.h" #include "output.h" #include "flags.h" #include "toplev.h" @@ -372,7 +370,7 @@ use_thunk (tree thunk_fndecl, bool emit_p) tree x = copy_node (a); TREE_CHAIN (x) = t; DECL_CONTEXT (x) = thunk_fndecl; - SET_DECL_RTL (x, NULL_RTX); + SET_DECL_RTL (x, NULL); DECL_HAS_VALUE_EXPR_P (x) = 0; t = x; } diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c index bad63f5..f512570 100644 --- a/gcc/cp/optimize.c +++ b/gcc/cp/optimize.c @@ -25,10 +25,7 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "tree.h" #include "cp-tree.h" -#include "rtl.h" -#include "insn-config.h" #include "input.h" -#include "integrate.h" #include "toplev.h" #include "params.h" #include "hashtab.h" diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 85bf1fd..6c9f31d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "obstack.h" #include "tree.h" #include "intl.h" #include "pointer-set.h" @@ -43,7 +42,6 @@ along with GCC; see the file COPYING3. If not see #include "output.h" #include "except.h" #include "toplev.h" -#include "rtl.h" #include "timevar.h" #include "tree-iterator.h" #include "vecprim.h" @@ -7241,7 +7239,7 @@ tsubst_friend_function (tree decl, tree args) later if we need it. */ if (TREE_CODE (new_friend) != TEMPLATE_DECL) { - SET_DECL_RTL (new_friend, NULL_RTX); + SET_DECL_RTL (new_friend, NULL); SET_DECL_ASSEMBLER_NAME (new_friend, NULL_TREE); } @@ -9133,7 +9131,7 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) TREE_TYPE (r) = type; /* Clear out the mangled name and RTL for the instantiation. */ SET_DECL_ASSEMBLER_NAME (r, NULL_TREE); - SET_DECL_RTL (r, NULL_RTX); + SET_DECL_RTL (r, NULL); /* Leave DECL_INITIAL set on deleted instantiations. */ if (!DECL_DELETED_FN (r)) DECL_INITIAL (r) = NULL_TREE; @@ -9561,12 +9559,12 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) /* Clear out the mangled name and RTL for the instantiation. */ SET_DECL_ASSEMBLER_NAME (r, NULL_TREE); if (CODE_CONTAINS_STRUCT (TREE_CODE (t), TS_DECL_WRTL)) - SET_DECL_RTL (r, NULL_RTX); + SET_DECL_RTL (r, NULL); /* The initializer must not be expanded until it is required; see [temp.inst]. */ DECL_INITIAL (r) = NULL_TREE; if (CODE_CONTAINS_STRUCT (TREE_CODE (t), TS_DECL_WRTL)) - SET_DECL_RTL (r, NULL_RTX); + SET_DECL_RTL (r, NULL); DECL_SIZE (r) = DECL_SIZE_UNIT (r) = 0; if (TREE_CODE (r) == VAR_DECL) { @@ -16814,7 +16812,7 @@ instantiate_decl (tree d, int defer_ok, /* Clear out DECL_RTL; whatever was there before may not be right since we've reset the type of the declaration. */ - SET_DECL_RTL (d, NULL_RTX); + SET_DECL_RTL (d, NULL); DECL_IN_AGGR_P (d) = 0; /* The initializer is placed in DECL_INITIAL by diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 11011e7..4843855 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -30,9 +30,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "cp-tree.h" #include "intl.h" -#include "obstack.h" #include "flags.h" -#include "rtl.h" #include "output.h" #include "toplev.h" #include "target.h" diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index b97a4c3..72a7295 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -36,11 +36,8 @@ along with GCC; see the file COPYING3. If not see #include "except.h" #include "toplev.h" #include "flags.h" -#include "rtl.h" -#include "expr.h" #include "output.h" #include "timevar.h" -#include "debug.h" #include "diagnostic.h" #include "cgraph.h" #include "tree-iterator.h" @@ -49,6 +46,8 @@ along with GCC; see the file COPYING3. If not see #include "gimple.h" #include "bitmap.h" +#include "rtl.h" /* For decl_default_tls_model. */ + /* There routines provide a modular interface to perform many parsing operations. They may therefore be used during actual parsing, or during template instantiation, which may be regarded as a diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 40a0c52..d5ccd65 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -27,16 +27,13 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "cp-tree.h" #include "flags.h" -#include "rtl.h" #include "toplev.h" -#include "insn-config.h" -#include "integrate.h" #include "tree-inline.h" #include "debug.h" -#include "target.h" #include "convert.h" #include "tree-flow.h" #include "cgraph.h" +#include "splay-tree.h" static tree bot_manip (tree *, int *, void *); static tree bot_replace (tree *, int *, void *); diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 77cf8fd..d819c7f 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -31,10 +31,7 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "expr.h" #include "cp-tree.h" -#include "tm_p.h" #include "flags.h" #include "output.h" #include "toplev.h" diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 743764b..d48ff16 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,11 @@ +2010-05-25 Steven Bosscher <steven@gcc.gnu.org> + + * objc-act.h: Do not include gimple.h. + * objc-act.c: Do not include rtl.h, expr.h, libfuncs.h, and tm_p.h. + Include gimple.h. Explain why except.h has to be included. + * objc-lang.c: Do not include diagnostics.h. + * Make-lang.in: Update dependencies. + 2010-05-25 Nathan Froyd <froydnj@codesourcery.com> * objc-act.c (objc_build_constructor): Adjust OBJCPLUS impedance diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index d4da736..144d01a 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -69,14 +69,13 @@ cc1obj$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o $(BACKEND) $( # Objective C language specific files. objc/objc-lang.o : objc/objc-lang.c \ - $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ - $(C_TREE_H) $(DIAGNOSTIC_H) \ + $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \ $(GGC_H) langhooks.h $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-objc.h \ - c-objc-common.h objc/objc-act.h $(GIMPLE_H) + c-objc-common.h objc/objc-act.h objc/objc-act.o : objc/objc-act.c \ - $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) $(TM_P_H) \ - $(EXPR_H) $(TARGET_H) $(C_TREE_H) $(DIAGNOSTIC_H) toplev.h $(FLAGS_H) \ + $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ + $(TARGET_H) $(C_TREE_H) $(DIAGNOSTIC_H) toplev.h $(FLAGS_H) \ objc/objc-act.h input.h $(FUNCTION_H) output.h debug.h langhooks.h \ $(LANGHOOKS_DEF_H) $(HASHTAB_H) $(C_PRAGMA_H) gt-objc-objc-act.h \ $(GIMPLE_H) c-lang.h diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 5961531..b1ca2e4 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -45,9 +45,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "tm_p.h" -#include "expr.h" #ifdef OBJCPLUS #include "cp-tree.h" @@ -62,7 +59,7 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "objc-act.h" #include "input.h" -#include "except.h" +#include "except.h" /* For USING_SJLJ_EXCEPTIONS. */ #include "function.h" #include "output.h" #include "toplev.h" @@ -73,10 +70,12 @@ along with GCC; see the file COPYING3. If not see #include "intl.h" #include "cgraph.h" #include "tree-iterator.h" -#include "libfuncs.h" #include "hashtab.h" #include "langhooks-def.h" +/* For enum gimplify_status */ +#include "gimple.h" + #define OBJC_VOID_AT_END void_list_node static unsigned int should_call_super_dealloc = 0; diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h index f0970f9..d8bf0f6 100644 --- a/gcc/objc/objc-act.h +++ b/gcc/objc/objc-act.h @@ -22,9 +22,6 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_OBJC_ACT_H #define GCC_OBJC_ACT_H -/* For enum gimplify_status */ -#include "gimple.h" - /*** Language hooks ***/ bool objc_init (void); diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c index acb1c84..04cea97 100644 --- a/gcc/objc/objc-lang.c +++ b/gcc/objc/objc-lang.c @@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see #include "objc-act.h" #include "langhooks.h" #include "langhooks-def.h" -#include "diagnostic.h" #include "c-objc-common.h" enum c_language_kind c_language = clk_objc; diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index 3d1b8b3..8623bb5 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,12 @@ +2010-05-25 Steven Bosscher <steven@gcc.gnu.org> + + * objcp-decl.c: Do not include tm.h, rtl.h, expr.h, c-common.h, + flags.h, input.h, except.h, output.h, toplev.h, cpplib.h, debug.h, + and target.h. + * objcp-lang.c: Do not include tm.h, toplev.h, diagnostics.h, + and debug.h. Explain why except.h has to be included. + * Make-lang.in: Update dependencies. + 2010-04-30 Steven Bosscher <steven@gcc.gnu.org> * objcp-decl.c: Do not include varray.h. diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in index cd93ae4..873b908 100644 --- a/gcc/objcp/Make-lang.in +++ b/gcc/objcp/Make-lang.in @@ -71,14 +71,13 @@ cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBDEPS) # Objective C++ language specific files. objcp/objcp-lang.o : objcp/objcp-lang.c \ - $(CXX_TREE_H) $(TM_H) toplev.h debug.h langhooks.h objc/objc-act.h \ - $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-objcp.h \ - $(DIAGNOSTIC_H) cp/cp-objcp-common.h $(GIMPLE_H) $(EXCEPT_H) + $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(CXX_TREE_H) \ + $(C_COMMON_H) $(LANGHOOKS_DEF_H) objc/objc-act.h cp/cp-objcp-common.h \ + gtype-objcp.h $(EXCEPT_H) objcp/objcp-decl.o : objcp/objcp-decl.c \ - $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \ - toplev.h $(GGC_H) $(C_PRAGMA_H) input.h $(FLAGS_H) output.h \ - objc/objc-act.h objcp/objcp-decl.h $(GIMPLE_H) $(EXPR_H) $(TARGET_H) + $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(CXX_TREE_H) \ + objc/objc-act.h objcp/objcp-decl.h # The following must be an explicit rule; please keep in sync with the implicit # one in Makefile.in. diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c index c8e34d4..8c68876 100644 --- a/gcc/objcp/objcp-decl.c +++ b/gcc/objcp/objcp-decl.c @@ -24,18 +24,7 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "expr.h" #include "cp-tree.h" -#include "c-common.h" -#include "flags.h" -#include "input.h" -#include "except.h" -#include "output.h" -#include "toplev.h" -#include "cpplib.h" -#include "debug.h" -#include "target.h" #include "objc-act.h" #include "objcp-decl.h" diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c index 47bff9a..4708229 100644 --- a/gcc/objcp/objcp-lang.c +++ b/gcc/objcp/objcp-lang.c @@ -26,14 +26,11 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "cp-tree.h" #include "c-common.h" -#include "toplev.h" #include "objc-act.h" #include "langhooks.h" #include "langhooks-def.h" -#include "diagnostic.h" -#include "debug.h" #include "cp-objcp-common.h" -#include "except.h" +#include "except.h" /* For USING_SJLJ_EXCEPTIONS. */ enum c_language_kind c_language = clk_objcxx; static void objcxx_init_ts (void); |