summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2010-12-29 02:17:47 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2010-12-29 02:17:47 +0000
commitdff917fb01a6b61001bc5805b09652001082058a (patch)
tree34c7450475400aed4762f58ffa49094607b7eda9
parentcad7fbbda3bc911491d2e8a496da5a20a9a81301 (diff)
downloadgcc-dff917fb01a6b61001bc5805b09652001082058a.tar.gz
PR c++/47068
* semantics.c (finish_id_expression): Don't note non-names as being used in the class. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168309 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/decltype24.C7
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f11d7d2a9ea..5f563157c3a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-28 Jason Merrill <jason@redhat.com>
+
+ PR c++/47068
+ * semantics.c (finish_id_expression): Don't note non-names
+ as being used in the class.
+
2010-12-23 Jason Merrill <jason@redhat.com>
* parser.c (cp_parser_unary_expression): Remove redundant C++0x
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 93493fb522d..aeb10fec8ac 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2797,7 +2797,8 @@ finish_id_expression (tree id_expression,
the current class so that we can check later to see if
the meaning would have been different after the class
was entirely defined. */
- if (!scope && decl != error_mark_node)
+ if (!scope && decl != error_mark_node
+ && TREE_CODE (id_expression) == IDENTIFIER_NODE)
maybe_note_name_used_in_class (id_expression, decl);
/* Disallow uses of local variables from containing functions, except
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 45d4441c52a..514dae3d913 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-28 Jason Merrill <jason@redhat.com>
+
+ PR c++/47068
+ * g++.dg/cpp0x/decltype24.C: New.
+
2010-12-28 Nicola Pero <nicola.pero@meta-innovation.com>
PR objc/47076
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype24.C b/gcc/testsuite/g++.dg/cpp0x/decltype24.C
new file mode 100644
index 00000000000..16d0736d66f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype24.C
@@ -0,0 +1,7 @@
+// PR c++/47068
+// { dg-options -std=c++0x }
+
+template <class T> struct broken {
+ int member;
+ typedef decltype(~ member) gcc_crashes_here;
+};