[google 4_7] Backport r194909 (<:: is incorrectly treated as digraph ...) to google/gcc-4_7 branch

[ppluzhnikov, 2013-01-04 17:33:00]

Back-port revision 194909 to google/gcc-4_7 branch:
http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=194909
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54526

Google ref: b/7427993

Index: gcc/testsuite/g++.old-deja/g++.other/crash28.C
===================================================================
--- gcc/testsuite/g++.old-deja/g++.other/crash28.C	(revision 194909)
+++ gcc/testsuite/g++.old-deja/g++.other/crash28.C	(working copy)
@@ -31,5 +31,5 @@
 };
 void foo::x() throw(bar)
 {
-  if (!b) throw bar (static_cast<::N::X*>(this));	// { dg-error "lambda
expressions|expected" } parse error
+  if (!b) throw bar (static_cast<::N::X*>(this));	// { dg-error "lambda
expressions|expected|invalid" } parse error
 }
Index: libcpp/lex.c
===================================================================
--- libcpp/lex.c	(revision 194909)
+++ libcpp/lex.c	(working copy)
@@ -2224,6 +2224,17 @@
 	{
 	  if (*buffer->cur == ':')
 	    {
+	      /* C++11 [2.5/3 lex.pptoken], "Otherwise, if the next
+		 three characters are <:: and the subsequent character
+		 is neither : nor >, the < is treated as a preprocessor
+		 token by itself".  */
+	      if (CPP_OPTION (pfile, cplusplus)
+		  && (CPP_OPTION (pfile, lang) == CLK_CXX11
+		      || CPP_OPTION (pfile, lang) == CLK_GNUCXX11)
+		  && buffer->cur[1] == ':'
+		  && buffer->cur[2] != ':' && buffer->cur[2] != '>')
+		break;
+
 	      buffer->cur++;
 	      result->flags |= DIGRAPH;
 	      result->type = CPP_OPEN_SQUARE;

--
This patch is available for review at http://codereview.appspot.com/7028052

[davidxl, 2013-01-04 17:41:21]

ok.

thanks,

David

On Fri, Jan 4, 2013 at 9:32 AM, Paul Pluzhnikov <ppluzhnikov@google.com> wrote:
> Back-port revision 194909 to google/gcc-4_7 branch:
> http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=194909
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54526
>
> Google ref: b/7427993
>
> Index: gcc/testsuite/g++.old-deja/g++.other/crash28.C
> ===================================================================
> --- gcc/testsuite/g++.old-deja/g++.other/crash28.C      (revision 194909)
> +++ gcc/testsuite/g++.old-deja/g++.other/crash28.C      (working copy)
> @@ -31,5 +31,5 @@
>  };
>  void foo::x() throw(bar)
>  {
> -  if (!b) throw bar (static_cast<::N::X*>(this));      // { dg-error "lambda
expressions|expected" } parse error
> +  if (!b) throw bar (static_cast<::N::X*>(this));      // { dg-error "lambda
expressions|expected|invalid" } parse error
>  }
> Index: libcpp/lex.c
> ===================================================================
> --- libcpp/lex.c        (revision 194909)
> +++ libcpp/lex.c        (working copy)
> @@ -2224,6 +2224,17 @@
>         {
>           if (*buffer->cur == ':')
>             {
> +             /* C++11 [2.5/3 lex.pptoken], "Otherwise, if the next
> +                three characters are <:: and the subsequent character
> +                is neither : nor >, the < is treated as a preprocessor
> +                token by itself".  */
> +             if (CPP_OPTION (pfile, cplusplus)
> +                 && (CPP_OPTION (pfile, lang) == CLK_CXX11
> +                     || CPP_OPTION (pfile, lang) == CLK_GNUCXX11)
> +                 && buffer->cur[1] == ':'
> +                 && buffer->cur[2] != ':' && buffer->cur[2] != '>')
> +               break;
> +
>               buffer->cur++;
>               result->flags |= DIGRAPH;
>               result->type = CPP_OPEN_SQUARE;
>
> --
> This patch is available for review at http://codereview.appspot.com/7028052

[ppluzhnikov, 2013-01-04 23:04:07]

On Fri, Jan 4, 2013 at 9:41 AM, Xinliang David Li <davidxl@google.com> wrote:
> ok.

The patch as sent caused some breakage, I had to adjust test cases a bit.

Submitting attached patch.

Thanks,
-- 
Paul Pluzhnikov

[davidxl, 2013-01-04 23:27:01]

I saw only one test case fix patch from Paolo in trunk. Does this
patch include more local fixes?

David

On Fri, Jan 4, 2013 at 3:03 PM, Paul Pluzhnikov <ppluzhnikov@google.com> wrote:
> On Fri, Jan 4, 2013 at 9:41 AM, Xinliang David Li <davidxl@google.com> wrote:
>> ok.
>
> The patch as sent caused some breakage, I had to adjust test cases a bit.
>
> Submitting attached patch.
>
> Thanks,
> --
> Paul Pluzhnikov

[ppluzhnikov, 2013-01-04 23:39:22]

On Fri, Jan 4, 2013 at 3:27 PM, Xinliang David Li <davidxl@google.com> wrote:
> I saw only one test case fix patch from Paolo in trunk. Does this
> patch include more local fixes?

There was an earlier patch which touched g++.dg/parse/error1{1,2}.C:

r191712 | paolo | 2012-09-25 07:44:52 -0700 (Tue, 25 Sep 2012) | 15 lines

/cp
2012-09-25  Paolo Carlini  <paolo.carlini@oracle.com>

        PR c++/54526
        * parser.c (cp_parser_template_id): In C++11 mode simply accept
        X<::A>.

/testsuite
2012-09-25  Paolo Carlini  <paolo.carlini@oracle.com>

        PR c++/54526
        * g++.dg/cpp0x/parse2.C: New.
        * g++.dg/parse/error11.C: Adjust.
        * g++.dg/parse/error12.C: Likewise.

The r194909 reverted parser.c change, but didn't revert error1{1,2}.C changes.

Current state of trunk vs. google/gcc-4_7 branch:

 diff -u ${trunk}/gcc/testsuite/g++.dg/parse/error11.C
${gcc-4_7}/gcc/testsuite/g++.dg/parse/error11.C
@@ -68,4 +68,4 @@

 // On the first error message, an additional note about the use of
 //  -fpermissive should be present
-// { dg-message "17:\\(if you use '-fpermissive' or '-std=c\\+\\+11',
or '-std=gnu\\+\\+11' G\\+\\+ will accept your code\\)" "-fpermissive"
{ target c++98 } 19 }
+// { dg-message "17:\\(if you use '-fpermissive' G\\+\\+ will accept
your code\\)" "-fpermissive" { target c++98 } 19 }


(Minor adjustment to the expected error message).

error12.C is identical on trunk and google/gcc-4_7.

Thanks,
-- 
Paul Pluzhnikov

[davidxl, 2013-01-04 23:56:45]

ok.

thanks,

David

On Fri, Jan 4, 2013 at 3:38 PM, Paul Pluzhnikov <ppluzhnikov@google.com> wrote:
> On Fri, Jan 4, 2013 at 3:27 PM, Xinliang David Li <davidxl@google.com> wrote:
>> I saw only one test case fix patch from Paolo in trunk. Does this
>> patch include more local fixes?
>
> There was an earlier patch which touched g++.dg/parse/error1{1,2}.C:
>
> r191712 | paolo | 2012-09-25 07:44:52 -0700 (Tue, 25 Sep 2012) | 15 lines
>
> /cp
> 2012-09-25  Paolo Carlini  <paolo.carlini@oracle.com>
>
>         PR c++/54526
>         * parser.c (cp_parser_template_id): In C++11 mode simply accept
>         X<::A>.
>
> /testsuite
> 2012-09-25  Paolo Carlini  <paolo.carlini@oracle.com>
>
>         PR c++/54526
>         * g++.dg/cpp0x/parse2.C: New.
>         * g++.dg/parse/error11.C: Adjust.
>         * g++.dg/parse/error12.C: Likewise.
>
> The r194909 reverted parser.c change, but didn't revert error1{1,2}.C
changes.
>
> Current state of trunk vs. google/gcc-4_7 branch:
>
>  diff -u ${trunk}/gcc/testsuite/g++.dg/parse/error11.C
> ${gcc-4_7}/gcc/testsuite/g++.dg/parse/error11.C
> @@ -68,4 +68,4 @@
>
>  // On the first error message, an additional note about the use of
>  //  -fpermissive should be present
> -// { dg-message "17:\\(if you use '-fpermissive' or '-std=c\\+\\+11',
> or '-std=gnu\\+\\+11' G\\+\\+ will accept your code\\)" "-fpermissive"
> { target c++98 } 19 }
> +// { dg-message "17:\\(if you use '-fpermissive' G\\+\\+ will accept
> your code\\)" "-fpermissive" { target c++98 } 19 }
>
>
> (Minor adjustment to the expected error message).
>
> error12.C is identical on trunk and google/gcc-4_7.
>
> Thanks,
> --
> Paul Pluzhnikov