revert accidental commit

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

diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index 2452abc..c91cb15 100644 (file)
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -44,23 +44,7 @@ cxx_print_decl (FILE *file, tree node, int indent)
   if (!CODE_CONTAINS_STRUCT (TREE_CODE (node), TS_DECL_COMMON)
       || !DECL_LANG_SPECIFIC (node))
     return;
   if (!CODE_CONTAINS_STRUCT (TREE_CODE (node), TS_DECL_COMMON)
       || !DECL_LANG_SPECIFIC (node))
     return;

-  if (TREE_CODE (node) == FUNCTION_DECL)
-    {
-      int flags = TFF_DECL_SPECIFIERS|TFF_RETURN_TYPE
-       |TFF_FUNCTION_DEFAULT_ARGUMENTS|TFF_EXCEPTION_SPECIFICATION ;
-      indent_to (file, indent + 3);
-      fprintf (file, " full-name \"%s\"", decl_as_string (node, flags));
-    }
-  else if (TREE_CODE (node) == TEMPLATE_DECL)
-    {
-      indent_to (file, indent + 3);
-      fprintf (file, " full-name \"%s\"",
-              decl_as_string (node, TFF_TEMPLATE_HEADER));
-    }
-

   indent_to (file, indent + 3);
   indent_to (file, indent + 3);

-  if (DECL_EXTERNAL (node) && DECL_NOT_REALLY_EXTERN (node))
-    fprintf (file, " not-really-extern");

   if (TREE_CODE (node) == FUNCTION_DECL
       && DECL_PENDING_INLINE_INFO (node))
     fprintf (file, " pending-inline-info %p",
   if (TREE_CODE (node) == FUNCTION_DECL
       && DECL_PENDING_INLINE_INFO (node))
     fprintf (file, " pending-inline-info %p",


@@ -97,9 +81,6 @@ cxx_print_type (FILE *file, tree node, int indent)
 
     case RECORD_TYPE:
     case UNION_TYPE:
 
     case RECORD_TYPE:
     case UNION_TYPE:

-      indent_to (file, indent + 4);
-      fprintf (file, "full-name \"%s\"",
-              type_as_string (node, TFF_CLASS_KEY_OR_ENUM));

       break;
 
     default:
       break;
 
     default:


@@ -116,7 +97,7 @@ cxx_print_type (FILE *file, tree node, int indent)
   indent_to (file, indent + 3);
 
   if (TYPE_NEEDS_CONSTRUCTING (node))
   indent_to (file, indent + 3);
 
   if (TYPE_NEEDS_CONSTRUCTING (node))

-    fputs ( " needs-constructor", file);
+    fputs ( "needs-constructor", file);

   if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (node))
     fputs (" needs-destructor", file);
   if (TYPE_HAS_DEFAULT_CONSTRUCTOR (node))
   if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (node))
     fputs (" needs-destructor", file);
   if (TYPE_HAS_DEFAULT_CONSTRUCTOR (node))

diff --git a/gcc/testsuite/g++.dg/init/const7.C b/gcc/testsuite/g++.dg/init/const7.C
index 18d0462..348bd58 100644 (file)
--- a/gcc/testsuite/g++.dg/init/const7.C
+++ b/gcc/testsuite/g++.dg/init/const7.C
@@ -9,5 +9,5 @@ short offsets[1] = {
 // This ensures that we get a dump whether or not the bug is present.
 void fn() { }
 
 // This ensures that we get a dump whether or not the bug is present.
 void fn() { }
 

-// { dg-final { scan-tree-dump-not "initialization"  "gimple" } }
+// { dg-final { scan-tree-dump-not "initialization"  "gimple" { xfail *-*-* } } }

 // { dg-final { cleanup-tree-dump "gimple" } }
 // { dg-final { cleanup-tree-dump "gimple" } }

diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index e01433b..ff45ecc 100644 (file)
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -2585,20 +2585,18 @@ print_call_name (pretty_printer *buffer, const_tree node)
   if (TREE_CODE (op0) == NON_LVALUE_EXPR)
     op0 = TREE_OPERAND (op0, 0);
 
   if (TREE_CODE (op0) == NON_LVALUE_EXPR)
     op0 = TREE_OPERAND (op0, 0);
 

- again:

   switch (TREE_CODE (op0))
     {
     case VAR_DECL:
     case PARM_DECL:
   switch (TREE_CODE (op0))
     {
     case VAR_DECL:
     case PARM_DECL:

-    case FUNCTION_DECL:

       dump_function_name (buffer, op0);
       break;
 
     case ADDR_EXPR:
     case INDIRECT_REF:
     case NOP_EXPR:
       dump_function_name (buffer, op0);
       break;
 
     case ADDR_EXPR:
     case INDIRECT_REF:
     case NOP_EXPR:

-      op0 = TREE_OPERAND (op0, 0);
-      goto again;
+      dump_generic_node (buffer, TREE_OPERAND (op0, 0), 0, 0, false);
+      break;

 
     case COND_EXPR:
       pp_string (buffer, "(");
 
     case COND_EXPR:
       pp_string (buffer, "(");

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 083cf09..7fed300 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -4316,10 +4316,12 @@ initializer_constant_valid_p (tree value, tree endtype)
        }
 
       /* Support narrowing pointer differences.  */
        }
 
       /* Support narrowing pointer differences.  */

-      ret = narrowing_initializer_constant_valid_p (value, endtype);
-      if (ret != NULL_TREE)
-       return ret;
-
+      if (TREE_CODE (value) == POINTER_PLUS_EXPR)
+       {
+         ret = narrowing_initializer_constant_valid_p (value, endtype);
+         if (ret != NULL_TREE)
+           return ret;
+       }

       break;
 
     case MINUS_EXPR:
       break;
 
     case MINUS_EXPR: