summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-28 09:58:45 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-28 09:58:45 +0000
commit5bb28bea72000b7896855bf4dd3d7d5e2e7a36f4 (patch)
tree5cef2dc7177e916f9ab27fa85823d5ffaecb91ff
parenta3625143418cc2bf53f95290985cc16708983708 (diff)
downloadgcc-5bb28bea72000b7896855bf4dd3d7d5e2e7a36f4.tar.gz
/cp
2016-04-28 Paolo Carlini <paolo.carlini@oracle.com> PR c++/70540 * semantics.c (process_outer_var_ref): Unconditionally return error_mark_node when mark_used returns false. /testsuite 2016-04-28 Paolo Carlini <paolo.carlini@oracle.com> PR c++/70540 * g++.dg/cpp0x/auto48.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235552 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/auto48.C8
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dc2de7696fb..80708966c1b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-28 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/70540
+ * semantics.c (process_outer_var_ref): Unconditionally return
+ error_mark_node when mark_used returns false.
+
2016-04-27 Release Manager
* GCC 6.1.0 released.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 019dd45cf6e..e59b3c505ae 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3276,7 +3276,7 @@ process_outer_var_ref (tree decl, tsubst_flags_t complain)
tree initializer = convert_from_reference (decl);
/* Mark it as used now even if the use is ill-formed. */
- if (!mark_used (decl, complain) && !(complain & tf_error))
+ if (!mark_used (decl, complain))
return error_mark_node;
bool saw_generic_lambda = false;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 44affe18997..b3194401864 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-28 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/70540
+ * g++.dg/cpp0x/auto48.C: New.
+
2016-04-27 Dominique d'Humieres <dominiq@lps.ens.fr>
* gfortran.dg/submodule_14.f08: Add cleanup-submodules.
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto48.C b/gcc/testsuite/g++.dg/cpp0x/auto48.C
new file mode 100644
index 00000000000..3e0b9ff601e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/auto48.C
@@ -0,0 +1,8 @@
+// PR c++/70540
+// { dg-do compile { target c++11 } }
+
+void
+foo ()
+{
+ auto f = [&] { return f; }; // { dg-error "before deduction" }
+}