From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 25 Jun 2018 17:14:01 +0000 (+0200)
Subject: backport: re PR sanitizer/83987 (ICE with OpenMP, sanitizer and virtual bases)
X-Git-Tag: releases/gcc-6.5.0~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1908522d090249aba71bc83caf2801b636dd8dbf;p=thirdparty%2Fgcc.git

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 d041338bdd30..b14901561490 100644
--- 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 c1e6dbb805dd..b2a259357eca 100644
--- 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 e727fe28b0e4..684e713900f5 100644
--- 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
index 000000000000..7ba7952b293e
--- /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;
+  }
+}