aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-04-28 22:56:44 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-04-28 22:56:44 +0000
commit4882d82a27be94484f38bb4f998b7e4ffa5772d1 (patch)
tree1e002582c793cbd7808194ef10ddd65c2b60259e
parent01187df0970be20c06628f280ce07524db49d585 (diff)
downloadgcc-4882d82a27be94484f38bb4f998b7e4ffa5772d1.zip
gcc-4882d82a27be94484f38bb4f998b7e4ffa5772d1.tar.gz
gcc-4882d82a27be94484f38bb4f998b7e4ffa5772d1.tar.bz2
re PR c++/56450 (ICE with SFINAE when detecting non-static member variable)
/cp 2013-04-28 Paolo Carlini <paolo.carlini@oracle.com> PR c++/56450 * semantics.c (finish_decltype_type): Handle COMPOUND_EXPR. /testsuite 2013-04-28 Paolo Carlini <paolo.carlini@oracle.com> PR c++/56450 * g++.dg/cpp0x/decltype52.C: New. From-SVN: r198381
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/semantics.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/decltype52.C18
4 files changed, 29 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 39fbc46..c614ebe 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-28 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/56450
+ * semantics.c (finish_decltype_type): Handle COMPOUND_EXPR.
+
2013-04-26 Jakub Jelinek <jakub@redhat.com>
* error.c (cp_print_error_function): Adjust file_name_as_prefix
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 3566739..2a0d5bc 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5398,6 +5398,7 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p,
break;
case COMPONENT_REF:
+ case COMPOUND_EXPR:
mark_type_use (expr);
type = is_bitfield_expr_with_lowered_type (expr);
if (!type)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cf34657..7e0975d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-28 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/56450
+ * g++.dg/cpp0x/decltype52.C: New.
+
2013-04-28 Jakub Jelinek <jakub@redhat.com>
N3472 binary constants
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype52.C b/gcc/testsuite/g++.dg/cpp0x/decltype52.C
new file mode 100644
index 0000000..e6b5a4c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype52.C
@@ -0,0 +1,18 @@
+// PR c++/56450
+// { dg-do compile { target c++11 } }
+
+template<typename T>
+T&& declval();
+
+template<typename, typename>
+struct is_same
+{ static constexpr bool value = false; };
+
+template<typename T>
+struct is_same<T, T>
+{ static constexpr bool value = true; };
+
+struct A { static const int dummy = 0; };
+
+static_assert(is_same<decltype(declval<A>().dummy), const int>::value, "");
+static_assert(!is_same<decltype(declval<A>().dummy), const int&>::value, "");