From 478a716ab7dd10051098c20e34a559b8d7be7f90 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 12 Oct 2009 17:04:35 -0400
Subject: [PATCH] re PR c++/37875 ([c++0x] misinterpreted closing angle bracket
 in decltype operand)

	PR c++/37875
	* parser.c (cp_parser_decltype): Set greater_than_is_operator_p.

From-SVN: r152686
---
 gcc/cp/ChangeLog                        |  3 +++
 gcc/cp/parser.c                         | 13 +++++++++++++
 gcc/testsuite/ChangeLog                 |  3 +++
 gcc/testsuite/g++.dg/cpp0x/decltype18.C |  5 +++++
 4 files changed, 24 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/decltype18.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 07dc96ae826..7765c73b9de 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-12  Jason Merrill  <jason@redhat.com>
 
+	PR c++/37875
+	* parser.c (cp_parser_decltype): Set greater_than_is_operator_p.
+
 	PR c++/37766
 	* pt.c (type_unification_real): Call convert_template_argument
 	for function default template arguments.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 44dceb21f74..5e37343294b 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9541,12 +9541,25 @@ cp_parser_decltype (cp_parser *parser)
     cp_parser_parse_definitely (parser);
   else
     {
+      bool saved_greater_than_is_operator_p;
+
       /* Abort our attempt to parse an id-expression or member access
          expression.  */
       cp_parser_abort_tentative_parse (parser);
 
+      /* Within a parenthesized expression, a `>' token is always
+	 the greater-than operator.  */
+      saved_greater_than_is_operator_p
+	= parser->greater_than_is_operator_p;
+      parser->greater_than_is_operator_p = true;
+
       /* Parse a full expression.  */
       expr = cp_parser_expression (parser, /*cast_p=*/false, NULL);
+
+      /* The `>' token might be the end of a template-id or
+	 template-parameter-list now.  */
+      parser->greater_than_is_operator_p
+	= saved_greater_than_is_operator_p;
     }
 
   /* Go back to evaluating expressions.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e9ca25b8e52..32b2ea4f8b4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-12  Jason Merrill  <jason@redhat.com>
 
+	PR c++/37875
+	* g++.dg/cpp0x/decltype18.C: New.
+
 	PR c++/37766
 	* g++.dg/cpp0x/fntmpdefarg1.C: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype18.C b/gcc/testsuite/g++.dg/cpp0x/decltype18.C
new file mode 100644
index 00000000000..0d44586e9d2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype18.C
@@ -0,0 +1,5 @@
+// PR c++/37875
+// { dg-options "-std=c++0x" }
+
+template <typename> struct X {};
+X<decltype(1 > 2)> x;
-- 
2.30.2