Backport r249728

2017-09-15  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-06-28  Martin Liska  <mliska@suse.cz>

	PR sanitizer/81224
	* asan.c (instrument_derefs): Bail out inner references
	that are hard register variables.
2017-09-15  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-06-28  Martin Liska  <mliska@suse.cz>

	PR sanitizer/81224
	* gcc.dg/asan/pr81224.c: New test.

From-SVN: r252814

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3753eeb1267f9779ea805c53e391bde60d663d5f..36f5b0c4063e78bcbdb72dba7d42b0c2985d5906 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-09-15  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-06-28  Martin Liska  <mliska@suse.cz>
+
+       PR sanitizer/81224
+       * asan.c (instrument_derefs): Bail out inner references
+       that are hard register variables.
+
 2017-09-15  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/asan.c b/gcc/asan.c
index 9b35104dd439769f8c3ea51dc0e187c911d53db3..b80df24acfd8d6de43620baaabc776c838ee62c1 100644 (file)
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -1800,6 +1800,9 @@ instrument_derefs (gimple_stmt_iterator *iter, tree t,
       || bitsize != size_in_bytes * BITS_PER_UNIT)
     return;
 
+  if (TREE_CODE (inner) == VAR_DECL && DECL_HARD_REGISTER (inner))
+    return;
+
   if (TREE_CODE (inner) == VAR_DECL
       && offset == NULL_TREE
       && bitpos >= 0

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 504d5dac28d3d27a73cf70ed37d08eba21aa93c1..51a838e591b7829014a3f5d20166ee2cbf051bb3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-15  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-06-28  Martin Liska  <mliska@suse.cz>
+
+       PR sanitizer/81224
+       * gcc.dg/asan/pr81224.c: New test.
+
 2017-09-15  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.dg/asan/pr81224.c b/gcc/testsuite/gcc.dg/asan/pr81224.c
new file mode 100644 (file)
index 0000000..def5cb6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/asan/pr81224.c
@@ -0,0 +1,11 @@
+/* PR sanitizer/80659 */
+/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-additional-options "-msse2" } */
+
+int a;
+int
+b ()
+{
+  register __attribute__ ((__vector_size__ (4 * sizeof (int)))) int c asm("xmm0");
+  return c[a];
+}