aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-08-17 14:42:09 -0400
committerJason Merrill <jason@gcc.gnu.org>2015-08-17 14:42:09 -0400
commitb361a15ff60daf83fc2ddccbc6166e4bd19e2b35 (patch)
treeef31c5fa83e6a037420b94a79071be095462bd86 /gcc/cp
parentceaaf873e9392ac3f196c400afbc91f70a9dbce2 (diff)
downloadgcc-b361a15ff60daf83fc2ddccbc6166e4bd19e2b35.zip
gcc-b361a15ff60daf83fc2ddccbc6166e4bd19e2b35.tar.gz
gcc-b361a15ff60daf83fc2ddccbc6166e4bd19e2b35.tar.bz2
re PR c++/67244 (internal compiler error: in gimplify_var_or_parm_decl, at gimplify.c:1801)
PR c++/67244 * pt.c (tsubst_copy_and_build): Call insert_pending_capture_proxies. From-SVN: r226950
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/pt.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 078ee74..ca00d03 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2015-08-17 Jason Merrill <jason@redhat.com>
+ PR c++/67244
+ * pt.c (tsubst_copy_and_build): Call insert_pending_capture_proxies.
+
PR c++/67104
* constexpr.c (array_index_cmp, find_array_ctor_elt): New.
(cxx_eval_array_reference, cxx_eval_store_expression): Use them.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index ecd86e4..b84bda4 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16344,6 +16344,8 @@ tsubst_copy_and_build (tree t,
LAMBDA_EXPR_THIS_CAPTURE (r) = NULL_TREE;
+ insert_pending_capture_proxies ();
+
RETURN (build_lambda_object (r));
}