aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-03-27 14:21:12 -0400
committerJason Merrill <jason@gcc.gnu.org>2013-03-27 14:21:12 -0400
commitd348f172601e946ada34175d77cbccd671d37f18 (patch)
tree9ff2b9ed517031d00a7cdbb146cb9afbd55ac77f /gcc/cp
parentf49b33cb227f01986ddbcc99b4d341ed22c26b62 (diff)
downloadgcc-d348f172601e946ada34175d77cbccd671d37f18.zip
gcc-d348f172601e946ada34175d77cbccd671d37f18.tar.gz
gcc-d348f172601e946ada34175d77cbccd671d37f18.tar.bz2
re PR c++/56749 (weird interaction between scoped enum used as non-type template parameter and template lookup)
PR c++/56749 * semantics.c (finish_qualified_id_expr): Return early for enum scope. From-SVN: r197166
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5a1cac4..714522e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-27 Jason Merrill <jason@redhat.com>
+
+ PR c++/56749
+ * semantics.c (finish_qualified_id_expr): Return early
+ for enum scope.
+
2013-03-26 Gabriel Dos Reis <gdr@integrable-solutions.net>
* call.c (build_new_method_call_1): Use INDIRECT_REF_P.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index fd77725..72b884e 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1762,6 +1762,10 @@ finish_qualified_id_expr (tree qualifying_class,
return expr;
}
+ /* No need to check access within an enum. */
+ if (TREE_CODE (qualifying_class) == ENUMERAL_TYPE)
+ return expr;
+
/* Within the scope of a class, turn references to non-static
members into expression of the form "this->...". */
if (template_arg_p)