backport: re PR sanitizer/83987 (ICE with OpenMP, sanitizer and virtual bases)

	Backported from mainline
	2018-01-23  Jakub Jelinek  <jakub@redhat.com>

	PR sanitizer/83987
	* tree.c (cp_free_lang_data): Change DECL_VALUE_EXPR of
	DECL_OMP_PRIVATIZED_MEMBER vars to error_mark_node.

	* g++.dg/ubsan/pr83987.C: New test.

From-SVN: r262056

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d041338bdd3071876ff880751d81ecde47fa7adb..b14901561490181b992694d44006b22a83fb9e6b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,12 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-01-23  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/83987
+       * tree.c (cp_free_lang_data): Change DECL_VALUE_EXPR of
+       DECL_OMP_PRIVATIZED_MEMBER vars to error_mark_node.
+
        2018-01-18  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/83824

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index c1e6dbb805ddd545d0bbcf668f9257a68491f5f8..b2a259357eca0de470e2e9602aee5377741cb3a1 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -4517,6 +4517,16 @@ cp_free_lang_data (tree t)
          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.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e727fe28b0e454f087de692ca0db3880cb5b1dea..684e713900f52fda614caa137412f6c0752121c9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-01-23  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/83987
+       * g++.dg/ubsan/pr83987.C: New test.
+
        2018-01-20  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/83930

diff --git a/gcc/testsuite/g++.dg/ubsan/pr83987.C b/gcc/testsuite/g++.dg/ubsan/pr83987.C
new file mode 100644 (file)
index 0000000..7ba7952
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ubsan/pr83987.C
@@ -0,0 +1,15 @@
+// PR sanitizer/83987
+// { dg-do compile { target fopenmp } }
+// { dg-options "-fopenmp -fsanitize=vptr -O0" }
+
+struct A { int i; };
+struct B : virtual A { void foo (); };
+
+void
+B::foo ()
+{
+#pragma omp sections lastprivate (i)
+  {
+    i = 0;
+  }
+}