Fix ICE in use-after-scope w/ -fno-tree-dce (PR sanitize/79783).

2017-03-06  Martin Liska  <mliska@suse.cz>

	PR sanitize/79783
	* asan.c (asan_expand_poison_ifn): Do not expand ASAN_POISON
	when having a SSA NAME w/o VAR_DECL assigned to it.
2017-03-06  Martin Liska  <mliska@suse.cz>

	PR sanitize/79783
	* g++.dg/asan/pr79783.C: New test.

From-SVN: r245912

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b588b47231b3f0bc5cb742e38ace0ba6ea6e372a..35f5288c7987b5a154586160e4b160783892e9ce 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-06  Martin Liska  <mliska@suse.cz>
+
+       PR sanitize/79783
+       * asan.c (asan_expand_poison_ifn): Do not expand ASAN_POISON
+       when having a SSA NAME w/o VAR_DECL assigned to it.
+
 2017-03-06  Prachi Godbole  <prachi.godbole@imgtec.com>
 
        * config/mips/mips-msa.md (msa_dotp_<su>_d, msa_dpadd_<su>_d,

diff --git a/gcc/asan.c b/gcc/asan.c
index 6cdd59b7ea7da25f015433cf9044a2c70ba4b7e1..7223e3cc68dc24fbb43859cae938b1ba17bba054 100644 (file)
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -3107,12 +3107,16 @@ asan_expand_poison_ifn (gimple_stmt_iterator *iter,
 {
   gimple *g = gsi_stmt (*iter);
   tree poisoned_var = gimple_call_lhs (g);
-  if (!poisoned_var)
+  if (!poisoned_var || has_zero_uses (poisoned_var))
     {
       gsi_remove (iter, true);
       return true;
     }
 
+  if (SSA_NAME_VAR (poisoned_var) == NULL_TREE)
+    SET_SSA_NAME_VAR_OR_IDENTIFIER (poisoned_var,
+                                   create_tmp_var (TREE_TYPE (poisoned_var)));
+
   tree shadow_var = create_asan_shadow_var (SSA_NAME_VAR (poisoned_var),
                                            shadow_vars_mapping);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9a44150b9313ec672974723fe53b79dec114efff..83e7a99b51430b308009736d6686c4cf5a112c4c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-06  Martin Liska  <mliska@suse.cz>
+
+       PR sanitize/79783
+       * g++.dg/asan/pr79783.C: New test.
+
 2017-03-06  Prachi Godbole  <prachi.godbole@imgtec.com>
 
        * gcc.target/mips/msa-dotp.c: New tests.

diff --git a/gcc/testsuite/g++.dg/asan/pr79783.C b/gcc/testsuite/g++.dg/asan/pr79783.C
new file mode 100644 (file)
index 0000000..939f60b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/asan/pr79783.C
@@ -0,0 +1,19 @@
+// PR sanitizer/79783
+// { dg-options "-fno-tree-dce" }
+
+struct A
+{
+  static void foo(const char&) {}
+};
+
+struct B
+{
+  B() { A::foo(char()); }
+};
+
+struct C
+{
+  virtual void bar() const { B b; }
+};
+
+C c;