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]

[gcc-in-cxx] Remove some differences from trunk


I committed this patch to the gcc-in-cxx branch to remove some
unnecessary differences between the branch and trunk.

Ian


2009-06-16  Ian Lance Taylor  <iant@google.com>

	* system.h (HAVE_DESIGNATED_INITIALIZERS): Remove duplicate
	setting for C++.
	* cp/parser.c (cp_parser_type_specifier): Change flags parameter
	back to cp_parser_flags.

	Revert the following patches:
	2009-03-04  Ian Lance Taylor  <iant@google.com>
	* ipa-struct-reorg.c (create_general_new_stmt): Initialize rhs.
	2009-02-04  Ian Lance Taylor  <iant@google.com>
	* ira-build.c (setup_min_max_conflict_allocno_ids): Use
	LIM_REG_CLASSES instead of -1.


Index: cp/parser.c
===================================================================
--- cp/parser.c	(revision 148514)
+++ cp/parser.c	(working copy)
@@ -11021,7 +11021,7 @@ cp_parser_explicit_specialization (cp_pa
 
 static tree
 cp_parser_type_specifier (cp_parser* parser,
-			  int flags,
+			  cp_parser_flags flags,
 			  cp_decl_specifier_seq *decl_specs,
 			  bool is_declaration,
 			  int* declares_class_or_enum,
Index: ira-build.c
===================================================================
--- ira-build.c	(revision 148514)
+++ ira-build.c	(working copy)
@@ -2275,14 +2275,14 @@ setup_min_max_conflict_allocno_ids (void
   ira_allocno_t a;
 
   live_range_min = (int *) ira_allocate (sizeof (int) * ira_allocnos_num);
-  cover_class = LIM_REG_CLASSES;
+  cover_class = -1;
   first_not_finished = -1;
   for (i = 0; i < ira_allocnos_num; i++)
     {
       a = ira_conflict_id_allocno_map[i];
       if (a == NULL)
 	continue;
-      if (cover_class == LIM_REG_CLASSES
+      if (cover_class < 0
 	  || (flag_ira_algorithm != IRA_ALGORITHM_PRIORITY
 	      && cover_class != (int) ALLOCNO_COVER_CLASS (a)))
 	{
@@ -2311,14 +2311,14 @@ setup_min_max_conflict_allocno_ids (void
       ALLOCNO_MIN (a) = min;
     }
   last_lived = (int *) ira_allocate (sizeof (int) * ira_max_point);
-  cover_class = LIM_REG_CLASSES;
+  cover_class = -1;
   filled_area_start = -1;
   for (i = ira_allocnos_num - 1; i >= 0; i--)
     {
       a = ira_conflict_id_allocno_map[i];
       if (a == NULL)
 	continue;
-      if (cover_class == LIM_REG_CLASSES
+      if (cover_class < 0
 	  || (flag_ira_algorithm != IRA_ALGORITHM_PRIORITY
 	      && cover_class != (int) ALLOCNO_COVER_CLASS (a)))
 	{
Index: system.h
===================================================================
--- system.h	(revision 148514)
+++ system.h	(working copy)
@@ -450,16 +450,11 @@ extern int vsnprintf(char *, size_t, con
 #endif
 
 /* 1 if we have C99 designated initializers.  */
-#ifdef __cplusplus
-#undef HAVE_DESIGNATED_INITIALIZERS
-#define HAVE_DESIGNATED_INITIALIZERS 0
-#else
 #if !defined(HAVE_DESIGNATED_INITIALIZERS)
 #define HAVE_DESIGNATED_INITIALIZERS \
   (((GCC_VERSION >= 2007) || (__STDC_VERSION__ >= 199901L)) \
    && !defined(__cplusplus))
 #endif
-#endif
 
 #if HAVE_SYS_STAT_H
 # include <sys/stat.h>
Index: ipa-struct-reorg.c
===================================================================
--- ipa-struct-reorg.c	(revision 148514)
+++ ipa-struct-reorg.c	(working copy)
@@ -1268,8 +1268,7 @@ create_general_new_stmt (struct access_s
       if (is_gimple_assign (new_stmt))
 	{
 	  lhs = gimple_assign_lhs (new_stmt);
-	  rhs = NULL_TREE;
-
+	  
 	  if (TREE_CODE (lhs) == SSA_NAME)
 	    lhs = SSA_NAME_VAR (lhs);
 	  if (gimple_assign_rhs_code (new_stmt) == SSA_NAME)

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