aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2011-09-23 00:54:32 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2011-09-23 00:54:32 +0000
commitee71530f565569b3972c5723b4aef3b6f8613211 (patch)
treef1571fce2ec69168cc809a1a8256b5db5f9692b2 /gcc/cp
parentf8b4d70d01982e40d1670cdb166a320d525b6adf (diff)
downloadgcc-ee71530f565569b3972c5723b4aef3b6f8613211.zip
gcc-ee71530f565569b3972c5723b4aef3b6f8613211.tar.gz
gcc-ee71530f565569b3972c5723b4aef3b6f8613211.tar.bz2
re PR c++/50491 ([C++0x] [4.6/4.7 Regression] "unexpected ast of kind using_decl" on call to using'ed grandparent member function)
/cp 2011-09-22 Paolo Carlini <paolo.carlini@oracle.com> PR c++/50491 * semantics.c (potential_constant_expression_1): Handle USING_DECL. /testsuite 2011-09-22 Paolo Carlini <paolo.carlini@oracle.com> PR c++/50491 * g++.dg/cpp0x/pr50491.C: New. From-SVN: r179109
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/semantics.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8ec7a05..249cab6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
2011-09-22 Paolo Carlini <paolo.carlini@oracle.com>
+ PR c++/50491
+ * semantics.c (potential_constant_expression_1): Handle USING_DECL.
+
+2011-09-22 Paolo Carlini <paolo.carlini@oracle.com>
+
PR c++/50371
* pt.c (invalid_nontype_parm_type_p): Handle NULLPTR_TYPE.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 150805f..0662b29 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -7751,6 +7751,7 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags)
/* We can see a FIELD_DECL in a pointer-to-member expression. */
case FIELD_DECL:
case PARM_DECL:
+ case USING_DECL:
return true;
case AGGR_INIT_EXPR: