From 44f4e4182bb7954a117781e7f4f658af69dec3fd Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 21 Jan 2019 23:33:52 +0100
Subject: [PATCH] re PR c++/88949 (ICE in expand_expr_real_1, at expr.c:10001
 with -fopenmp)

	PR c++/88949
	* optimize.c (cxx_copy_decl): New function.
	(clone_body): Use it instead of copy_decl_no_change.

	* g++.dg/gomp/pr88949.C: New test.

From-SVN: r268127
---
 gcc/cp/ChangeLog                    |  4 ++++
 gcc/cp/optimize.c                   | 21 ++++++++++++++++++++-
 gcc/testsuite/ChangeLog             |  5 +++++
 gcc/testsuite/g++.dg/gomp/pr88949.C | 23 +++++++++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/gomp/pr88949.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e5ce94c75e8..111782aeaba 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2019-01-21  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/88949
+	* optimize.c (cxx_copy_decl): New function.
+	(clone_body): Use it instead of copy_decl_no_change.
+
 	PR sanitizer/88901
 	* typeck.c (cp_build_binary_op): Don't instrument
 	SANITIZE_POINTER_COMPARE if processing_template_decl.
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 40d0dcc3995..7b6edfc0e49 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -61,6 +61,25 @@ update_cloned_parm (tree parm, tree cloned_parm, bool first)
   DECL_GIMPLE_REG_P (cloned_parm) = DECL_GIMPLE_REG_P (parm);
 }
 
+/* Like copy_decl_no_change, but handle DECL_OMP_PRIVATIZED_MEMBER
+   properly.  */
+
+static tree
+cxx_copy_decl (tree decl, copy_body_data *id)
+{
+  tree copy = copy_decl_no_change (decl, id);
+  if (VAR_P (decl)
+      && DECL_HAS_VALUE_EXPR_P (decl)
+      && DECL_ARTIFICIAL (decl)
+      && DECL_LANG_SPECIFIC (decl)
+      && DECL_OMP_PRIVATIZED_MEMBER (decl))
+    {
+      tree expr = DECL_VALUE_EXPR (copy);
+      walk_tree (&expr, copy_tree_body_r, id, NULL);
+      SET_DECL_VALUE_EXPR (copy, expr);
+    }
+  return copy;
+}
 
 /* FN is a function in High GIMPLE form that has a complete body and no
    CFG.  CLONE is a function whose body is to be set to a copy of FN,
@@ -80,7 +99,7 @@ clone_body (tree clone, tree fn, void *arg_map)
   id.src_cfun = DECL_STRUCT_FUNCTION (fn);
   id.decl_map = static_cast<hash_map<tree, tree> *> (arg_map);
 
-  id.copy_decl = copy_decl_no_change;
+  id.copy_decl = cxx_copy_decl;
   id.transform_call_graph_edges = CB_CGE_DUPLICATE;
   id.transform_new_cfg = true;
   id.transform_return_to_modify = false;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ce462ac79d9..86910c2b4f7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88949
+	* g++.dg/gomp/pr88949.C: New test.
+
 2019-01-21  Manfred Schwarb  <manfred99@gmx.ch>
 
 	* class_66.f90: Fix a dg directive.
diff --git a/gcc/testsuite/g++.dg/gomp/pr88949.C b/gcc/testsuite/g++.dg/gomp/pr88949.C
new file mode 100644
index 00000000000..04d2415971a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr88949.C
@@ -0,0 +1,23 @@
+// PR c++/88949
+// { dg-do compile }
+
+struct A {
+  int a;
+  A (int x) : a (x) {
+#pragma omp parallel firstprivate (a)
+    --a;
+  }
+  void foo () {
+#pragma omp parallel firstprivate (a)
+    --a;
+  }
+};
+
+int c;
+
+int
+main ()
+{
+  A d(c);
+  d.foo ();
+}