c-ubsan.c (ubsan_instrument_bounds): Don't instrument if TYPE_MAX_VALUE is NULL.

	* c-ubsan.c (ubsan_instrument_bounds): Don't instrument if
	TYPE_MAX_VALUE is NULL.

	* gcc.dg/ubsan/bounds-1.c: New test.

From-SVN: r212552

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 2cd29fe927f9c832cc4fd5ed8547d9c09b8635fe..977de693e5c5c2e1d9427b8e16dc906a9882f95d 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-15  Marek Polacek  <polacek@redhat.com>
+
+       * c-ubsan.c (ubsan_instrument_bounds): Don't instrument if
+       TYPE_MAX_VALUE is NULL.
+
 2014-07-14  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/61294

diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index 36985806b4e1aa773cfc36e092a215817a7417dd..ad5dd0bf92af5aa43fdad278316d91662b15c195 100644 (file)
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -265,7 +265,7 @@ ubsan_instrument_bounds (location_t loc, tree array, tree *index,
   tree type = TREE_TYPE (array);
   tree domain = TYPE_DOMAIN (type);
 
-  if (domain == NULL_TREE)
+  if (domain == NULL_TREE || TYPE_MAX_VALUE (domain) == NULL_TREE)
     return NULL_TREE;
 
   tree bound = TYPE_MAX_VALUE (domain);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2f259639676a24c8ef650c43dba1ccb6408f80c0..8332a20c859f9697f6e25b30b6959199c39f46c9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-15  Marek Polacek  <polacek@redhat.com>
+
+       * gcc.dg/ubsan/bounds-1.c: New test.
+
 2014-06-15  Tobias Burnus  <burnus@net-b.de>
 
        * gfortran.dg/coarray_34.f90: New.

diff --git a/gcc/testsuite/gcc.dg/ubsan/bounds-1.c b/gcc/testsuite/gcc.dg/ubsan/bounds-1.c
new file mode 100644 (file)
index 0000000..6f3cd2d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ubsan/bounds-1.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=bounds" } */
+
+struct T { int c; char d[]; } t = { 1, "abcdefg" };
+
+int
+baz (int i)
+{
+  return t.d[i];
+}