From: Jason Merrill <jason@redhat.com>
Date: Tue, 9 Jul 2013 17:56:14 +0000 (-0400)
Subject: re PR c++/57532 (operator& broken when used on rvalues)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a3970ddfc50ed831d621c77a0b2157700302fa8;p=gcc.git

re PR c++/57532 (operator& broken when used on rvalues)

	PR c++/57532
	* parser.c (cp_parser_ref_qualifier_opt): Don't tentatively parse
	a ref-qualifier in C++98 mode.

From-SVN: r200842
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aab2844e138..2d6fa73d011 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2013-07-09  Jason Merrill  <jason@redhat.com>
 
+	PR c++/57532
+	* parser.c (cp_parser_ref_qualifier_opt): Don't tentatively parse
+	a ref-qualifier in C++98 mode.
+
 	PR c++/57545
 	* pt.c (convert_nontype_argument) [INTEGER_CST]: Force the
 	argument to have the exact type of the parameter.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e2c3c3e95e4..614cf4364b8 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -17374,6 +17374,10 @@ cp_parser_ref_qualifier_opt (cp_parser* parser)
 {
   cp_ref_qualifier ref_qual = REF_QUAL_NONE;
 
+  /* Don't try to parse bitwise '&' as a ref-qualifier (c++/57532).  */
+  if (cxx_dialect < cxx11 && cp_parser_parsing_tentatively (parser))
+    return ref_qual;
+
   while (true)
     {
       cp_ref_qualifier curr_ref_qual = REF_QUAL_NONE;
diff --git a/gcc/testsuite/g++.dg/parse/ref-qual2.C b/gcc/testsuite/g++.dg/parse/ref-qual2.C
new file mode 100644
index 00000000000..a78597b0cd4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/ref-qual2.C
@@ -0,0 +1,6 @@
+// PR c++/57532
+
+int main()
+{
+    return (int() & int());
+}