aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2010-12-28 21:17:47 -0500
committerJason Merrill <jason@gcc.gnu.org>2010-12-28 21:17:47 -0500
commitc97c25c0b9561961b00d107647a1d9b0213507a8 (patch)
tree34c7450475400aed4762f58ffa49094607b7eda9 /gcc
parent6f13089ed5931ed54b0ca7412814121134c9bcdd (diff)
downloadgcc-c97c25c0b9561961b00d107647a1d9b0213507a8.zip
gcc-c97c25c0b9561961b00d107647a1d9b0213507a8.tar.gz
gcc-c97c25c0b9561961b00d107647a1d9b0213507a8.tar.bz2
re PR c++/47068 ([C++0x] internal compiler error on decltype(~ expression))
PR c++/47068 * semantics.c (finish_id_expression): Don't note non-names as being used in the class. From-SVN: r168309
Diffstat (limited to 'gcc')
-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 f11d7d2..5f56315 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 93493fb..aeb10fe 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 45d4441..514dae3 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 0000000..16d0736
--- /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;
+};