aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-02-10 00:22:43 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2018-02-10 00:22:43 +0100
commit6724f8a61d49dfdfaa11995765b85ee170e48ac7 (patch)
tree1bcb77e081a3462478d62cb53e68a5a3c07df260 /gcc/cp
parent5ca8e744641e1b03cc6e4cdbc46e7ece0750240d (diff)
downloadgcc-6724f8a61d49dfdfaa11995765b85ee170e48ac7.zip
gcc-6724f8a61d49dfdfaa11995765b85ee170e48ac7.tar.gz
gcc-6724f8a61d49dfdfaa11995765b85ee170e48ac7.tar.bz2
re PR sanitizer/83987 (ICE with OpenMP, sanitizer and virtual bases)
PR sanitizer/83987 * omp-low.c (maybe_remove_omp_member_access_dummy_vars, remove_member_access_dummy_vars): New functions. (lower_omp_for, lower_omp_taskreg, lower_omp_target, lower_omp_1, execute_lower_omp): Use them. * tree.c (cp_free_lang_data): Revert 2018-01-23 change. * g++.dg/ubsan/pr83987-2.C: New test. From-SVN: r257545
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/tree.c10
2 files changed, 5 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9df4c29..e01e73b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-10 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/83987
+ * tree.c (cp_free_lang_data): Revert 2018-01-23 change.
+
2018-02-09 Jason Merrill <jason@redhat.com>
PR c++/81917 - ICE with void_t and partial specialization.
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index d85f934..a53bddf 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -5273,16 +5273,6 @@ cp_free_lang_data (tree t)
/* We do not need the leftover chaining of namespaces from the
binding level. */
DECL_CHAIN (t) = NULL_TREE;
- /* Set DECL_VALUE_EXPRs of OpenMP privatized member artificial
- decls to error_mark_node. These are DECL_IGNORED_P and after
- OpenMP lowering they aren't useful anymore. Clearing DECL_VALUE_EXPR
- doesn't work, as expansion could then consider them as something
- to be expanded. */
- if (VAR_P (t)
- && DECL_LANG_SPECIFIC (t)
- && DECL_OMP_PRIVATIZED_MEMBER (t)
- && DECL_IGNORED_P (t))
- SET_DECL_VALUE_EXPR (t, error_mark_node);
}
/* Stub for c-common. Please keep in sync with c-decl.c.