From a669372a3a1c6ce2ff5474612bcf27811afbc65f Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Wed, 18 Feb 2009 16:03:05 -0500
Subject: [PATCH] revert accidental commit

From-SVN: r144271
---
 gcc/cp/ptree.c                     | 21 +--------------------
 gcc/testsuite/g++.dg/init/const7.C |  2 +-
 gcc/tree-pretty-print.c            |  6 ++----
 gcc/varasm.c                       | 10 ++++++----
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index 2452abc4622..c91cb15dc74 100644
--- 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 (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);
-  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",
@@ -97,9 +81,6 @@ cxx_print_type (FILE *file, tree node, int indent)
 
     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:
@@ -116,7 +97,7 @@ cxx_print_type (FILE *file, tree node, int indent)
   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))
diff --git a/gcc/testsuite/g++.dg/init/const7.C b/gcc/testsuite/g++.dg/init/const7.C
index 18d04625db2..348bd58d690 100644
--- 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() { }
 
-// { dg-final { scan-tree-dump-not "initialization"  "gimple" } }
+// { dg-final { scan-tree-dump-not "initialization"  "gimple" { xfail *-*-* } } }
 // { dg-final { cleanup-tree-dump "gimple" } }
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index e01433b142d..ff45ecc635d 100644
--- 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);
 
- again:
   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:
-      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, "(");
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 083cf093f25..7fed3009b84 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -4316,10 +4316,12 @@ initializer_constant_valid_p (tree value, tree endtype)
 	}
 
       /* 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: