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: r252813

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 38cbf7dff759530b297198b340216f76e3119d61..df6a3116d0ff2d095f25ba98a0cd528e0b40e522 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 8e359681fc434c7073743f65463183407dcde25d..3edbdf37612da3d106114321b87749aba4f09a03 100644 (file)
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -1802,6 +1802,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 576064b4f2c77e2762b3573f6fb22afe0c75bb55..f79cb0d3ff60c963465f75a96ce96f0ba097cfde 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];
+}