From: Thomas Schwinge <thomas@codesourcery.com>
Date: Mon, 11 Dec 2017 09:49:25 +0000 (+0100)
Subject: [PR c++/83301] cgraph.c segfault
X-Git-Tag: releases/gcc-6.5.0~643
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2985f85248de65a7b9a9fd3a64721ea72389aa;p=thirdparty%2Fgcc.git

[PR c++/83301] cgraph.c segfault

Backport trunk r243377:

	gcc/
	2016-12-07  Jakub Jelinek  <jakub@redhat.com>

	PR c++/78692
	* cgraph.c (cgraph_edge::redirect_call_stmt_to_callee): Set lhs
	var to lhs of new_stmt right before noreturn handling rather than to
	lhs of e->call_stmt early.

	gcc/testsuite/
	2016-12-07  Jakub Jelinek  <jakub@redhat.com>

	PR c++/78692
	* g++.dg/torture/pr78692.C: New test.

From-SVN: r255538
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e586870d1281..35a70d4fbcf5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2017-12-11  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR c++/83301
+
+	Backport trunk r243377:
+	2016-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/78692
+	* cgraph.c (cgraph_edge::redirect_call_stmt_to_callee): Set lhs
+	var to lhs of new_stmt right before noreturn handling rather than to
+	lhs of e->call_stmt early.
+
 2017-12-04  Sebastian Peryt  <sebastian.peryt@intel.com>
 	H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 6ff8f26ef391..0c9d9696c631 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -1259,7 +1259,6 @@ cgraph_edge::redirect_call_stmt_to_callee (void)
   cgraph_edge *e = this;
 
   tree decl = gimple_call_fndecl (e->call_stmt);
-  tree lhs = gimple_call_lhs (e->call_stmt);
   gcall *new_stmt;
   gimple_stmt_iterator gsi;
   bool skip_bounds = false;
@@ -1529,6 +1528,7 @@ cgraph_edge::redirect_call_stmt_to_callee (void)
     gimple_call_set_fntype (new_stmt, TREE_TYPE (e->callee->decl));
 
   /* If the call becomes noreturn, remove the LHS if possible.  */
+  tree lhs = gimple_call_lhs (new_stmt);
   if (lhs
       && (gimple_call_flags (new_stmt) & ECF_NORETURN)
       && (VOID_TYPE_P (TREE_TYPE (gimple_call_fntype (new_stmt)))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a1b459f2b5a..0fae4dce0d1f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2017-12-11  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR c++/83301
+
+	Backport trunk r243377:
+	2016-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/78692
+	* g++.dg/torture/pr78692.C: New test.
+
 2017-12-04  Sebastian Peryt  <sebastian.peryt@intel.com>
 	H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/gcc/testsuite/g++.dg/torture/pr78692.C b/gcc/testsuite/g++.dg/torture/pr78692.C
new file mode 100644
index 000000000000..57a0d2fcb0a6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr78692.C
@@ -0,0 +1,26 @@
+// PR c++/78692
+
+int a;
+void *b;
+extern "C" {
+struct C {
+  virtual int d ();
+};
+struct E {
+  virtual int operator () (int, const void *, int) = 0;
+};
+class F {
+  int g ();
+  int h;
+  E &i;
+};
+struct : C, E {
+  int operator () (int, const void *, int) { throw int(); }
+} j;
+
+int
+F::g ()
+{
+  a = i (h, b, 0);
+}
+}