]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
re PR c++/42687 (The prevention of ADL with the help of parentheses doesn't work)
authorJason Merrill <jason@redhat.com>
Wed, 27 Apr 2011 05:20:46 +0000 (01:20 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Wed, 27 Apr 2011 05:20:46 +0000 (01:20 -0400)
PR c++/42687
* parser.c (cp_parser_primary_expression): Set *idk to
CP_ID_KIND_NONE for a parenthesized identifier.

From-SVN: r173010

gcc/cp/ChangeLog
gcc/cp/parser.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/lookup/koenig13.C [new file with mode: 0644]

index 00542f91bf881002a314a86af9e91ef79d4e1e82..ac636d34538701f78013c827750bd7c021cc913e 100644 (file)
@@ -1,3 +1,9 @@
+2011-04-26  Jason Merrill  <jason@redhat.com>
+
+       PR c++/42687
+       * parser.c (cp_parser_primary_expression): Set *idk to
+       CP_ID_KIND_NONE for a parenthesized identifier.
+
 2011-04-20  Jason Merrill  <jason@redhat.com>
 
        PR c++/48594
index ca6eda75608953f955ade29ae2fe18fcf865b53a..d83283b634fa003e92d12ab2c03e2a41b7cecfd3 100644 (file)
@@ -3325,6 +3325,12 @@ cp_parser_primary_expression (cp_parser *parser,
               `&A::B' might be a pointer-to-member, but `&(A::B)' is
               not.  */
            finish_parenthesized_expr (expr);
+           /* DR 705: Wrapping an unqualified name in parentheses
+              suppresses arg-dependent lookup.  We want to pass back
+              CP_ID_KIND_QUALIFIED for suppressing vtable lookup
+              (c++/37862), but none of the others.  */
+           if (*idk != CP_ID_KIND_QUALIFIED)
+             *idk = CP_ID_KIND_NONE;
          }
        /* The `>' token might be the end of a template-id or
           template-parameter-list now.  */
index 523b0dcb869a942ddc534d509e65b62d2f8cc890..888ee603508250ff52b23fbe2b6ca6ca0a4c9af9 100644 (file)
@@ -1,3 +1,7 @@
+2011-04-26  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/lookup/koenig13.C: New.
+
 2011-04-26  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
diff --git a/gcc/testsuite/g++.dg/lookup/koenig13.C b/gcc/testsuite/g++.dg/lookup/koenig13.C
new file mode 100644 (file)
index 0000000..625a181
--- /dev/null
@@ -0,0 +1,16 @@
+// PR c++/42687
+// DR 705
+
+namespace N
+{
+    struct S { };
+    void f(const S &) { }
+}
+
+void f(const N::S &) { }
+
+int main()
+{
+    N::S v;
+    (f)(v); // no ambiguity: ADL is prevented with (), only ::f is considered
+}