From: Jason Merrill <jason@redhat.com>
Date: Wed, 16 Oct 2013 21:58:29 +0000 (-0400)
Subject: error.c (dump_exception_spec): Print "noexcept" rather than "noexcept (true)".
X-Git-Tag: upstream/12.2.0~67234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a1f2bc5139648b2559404328e0e31966ebb8732;p=platform%2Fupstream%2Fgcc.git

error.c (dump_exception_spec): Print "noexcept" rather than "noexcept (true)".

	* error.c (dump_exception_spec): Print "noexcept" rather than
	"noexcept (true)".

From-SVN: r203726
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2852f1f..2091b9f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2013-10-16  Jason Merrill  <jason@redhat.com>
 
+	* error.c (dump_exception_spec): Print "noexcept" rather than
+	"noexcept (true)".
+
 	Core 1591
 	* pt.c (unify_array_domain): Split out from unify.
 	(unify): Use it for list deduction, too.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 0c3cead..3f6f594 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1595,13 +1595,16 @@ dump_exception_spec (cxx_pretty_printer *pp, tree t, int flags)
   if (t && TREE_PURPOSE (t))
     {
       pp_cxx_ws_string (pp, "noexcept");
-      pp_cxx_whitespace (pp);
-      pp_cxx_left_paren (pp);
-      if (DEFERRED_NOEXCEPT_SPEC_P (t))
-	pp_cxx_ws_string (pp, "<uninstantiated>");
-      else
-	dump_expr (pp, TREE_PURPOSE (t), flags);
-      pp_cxx_right_paren (pp);
+      if (!integer_onep (TREE_PURPOSE (t)))
+	{
+	  pp_cxx_whitespace (pp);
+	  pp_cxx_left_paren (pp);
+	  if (DEFERRED_NOEXCEPT_SPEC_P (t))
+	    pp_cxx_ws_string (pp, "<uninstantiated>");
+	  else
+	    dump_expr (pp, TREE_PURPOSE (t), flags);
+	  pp_cxx_right_paren (pp);
+	}
     }
   else if (t)
     {