convert.c (convert_to_integer): Don't instrument conversions if the function has...

	* convert.c (convert_to_integer): Don't instrument conversions if the
	function has no_sanitize_undefined attribute.
	* ubsan.c: Don't run the ubsan pass if the function has
	no_sanitize_undefined attribute.
c/
	* c-decl.c (grokdeclarator): Don't instrument VLAs if the function
	has no_sanitize_undefined attribute.
cp/
	* cp-gimplify.c (cp_genericize): Don't instrument returns if the
	function has no_sanitize_undefined attribute.
	* decl.c (compute_array_index_type): Don't instrument VLAs if the
	function has no_sanitize_undefined attribute.
testsuite/
	* c-c++-common/ubsan/attrib-2.c: New test.
	* g++.dg/ubsan/return-3.C: New test.

From-SVN: r212148

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bae36686dbe233fe7dd2850dd6e5e10b36e03f5e..70f80885dcdf67ce5e11b9589933d6a9e0bdcc0a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-30  Marek Polacek  <polacek@redhat.com>
+
+       * convert.c (convert_to_integer): Don't instrument conversions if the
+       function has no_sanitize_undefined attribute.
+       * ubsan.c: Don't run the ubsan pass if the function has
+       no_sanitize_undefined attribute.
+
 2014-06-30  Jakub Jelinek  <jakub@redhat.com>
 
        * doc/invoke.texi (-fsanitize=bounds): Move to the table with

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 02a0f2f676ac6828fc815619c5de2ff996a6c9b3..6740d513d660e1492a9c571d4e67426339970067 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-30  Marek Polacek  <polacek@redhat.com>
+
+       * c-decl.c (grokdeclarator): Don't instrument VLAs if the function
+       has no_sanitize_undefined attribute.
+
 2014-06-30  Igor Zamyatin  <igor.zamyatin@intel.com>
 
        PR middle-end/57541

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index def10a2e2de6e0a773420bb9d9f00418d3fa79ed..7c37edfd3728c95abd398bca0d7c8937ebffb930 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -5505,7 +5505,11 @@ grokdeclarator (const struct c_declarator *declarator,
                    this_size_varies = size_varies = true;
                    warn_variable_length_array (name, size);
                    if (flag_sanitize & SANITIZE_VLA
-                       && decl_context == NORMAL)
+                       && decl_context == NORMAL
+                       && current_function_decl != NULL_TREE
+                       && !lookup_attribute ("no_sanitize_undefined",
+                                             DECL_ATTRIBUTES
+                                               (current_function_decl)))
                      {
                        /* Evaluate the array size only once.  */
                        size = c_save_expr (size);

diff --git a/gcc/convert.c b/gcc/convert.c
index 2d9600dd853db47487e4d4f08e51dbc568d5b9ba..09bc555ee0ee88ddb3a05f647e7ea13476889de7 100644 (file)
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -847,7 +847,10 @@ convert_to_integer (tree type, tree expr)
       return build1 (CONVERT_EXPR, type, expr);
 
     case REAL_TYPE:
-      if (flag_sanitize & SANITIZE_FLOAT_CAST)
+      if (flag_sanitize & SANITIZE_FLOAT_CAST
+         && current_function_decl != NULL_TREE
+         && !lookup_attribute ("no_sanitize_undefined",
+                               DECL_ATTRIBUTES (current_function_decl)))
        {
          expr = save_expr (expr);
          tree check = ubsan_instrument_float_cast (loc, type, expr);

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index edf79e7d526dddaf8a0e5b36796baa63fca8dffe..6d5b43f193d22c70f48c15d4d53fe542aeec8a5f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-30  Marek Polacek  <polacek@redhat.com>
+
+       * cp-gimplify.c (cp_genericize): Don't instrument returns if the
+       function has no_sanitize_undefined attribute.
+       * decl.c (compute_array_index_type): Don't instrument VLAs if the
+       function has no_sanitize_undefined attribute.
+
 2014-06-30  Igor Zamyatin  <igor.zamyatin@intel.com>
 
        PR middle-end/57541

diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 296bd5f2443e2403a23e391763562787c5b7498c..a35177bdbda799ef4d3103282ea17a627f17c7e0 100644 (file)
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -1221,7 +1221,7 @@ cp_genericize_tree (tree* t_p)
 
 /* If a function that should end with a return in non-void
    function doesn't obviously end with return, add ubsan
-   instrmentation code to verify it at runtime.  */
+   instrumentation code to verify it at runtime.  */
 
 static void
 cp_ubsan_maybe_instrument_return (tree fndecl)
@@ -1334,7 +1334,10 @@ cp_genericize (tree fndecl)
      walk_tree's hash functionality.  */
   cp_genericize_tree (&DECL_SAVED_TREE (fndecl));
 
-  if (flag_sanitize & SANITIZE_RETURN)
+  if (flag_sanitize & SANITIZE_RETURN
+      && current_function_decl != NULL_TREE
+      && !lookup_attribute ("no_sanitize_undefined",
+                           DECL_ATTRIBUTES (current_function_decl)))
     cp_ubsan_maybe_instrument_return (fndecl);
 
   /* Do everything else.  */

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index d548f61fa51879008664ad22070f9da50bfa72b6..6902bb053e2f99bdb7e3a2742eb85ff266b82fe8 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8469,7 +8469,11 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
                             throw_bad_array_length (), void_node);
              finish_expr_stmt (comp);
            }
-         else if (flag_sanitize & SANITIZE_VLA)
+         else if (flag_sanitize & SANITIZE_VLA
+                  && current_function_decl != NULL_TREE
+                  && !lookup_attribute ("no_sanitize_undefined",
+                                        DECL_ATTRIBUTES
+                                          (current_function_decl)))
            {
              /* From C++1y onwards, we throw an exception on a negative
                 length size of an array; see above.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c2ed2736f152f603e9c1c761480ff02a846fe218..4191a9728cf6e4de10705d7ae73e808796ecb586 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-30  Marek Polacek  <polacek@redhat.com>
+
+       * c-c++-common/ubsan/attrib-2.c: New test.
+       * g++.dg/ubsan/return-3.C: New test.
+
 2014-06-30  Igor Zamyatin  <igor.zamyatin@intel.com>
 
        PR middle-end/57541

diff --git a/gcc/testsuite/c-c++-common/ubsan/attrib-2.c b/gcc/testsuite/c-c++-common/ubsan/attrib-2.c
new file mode 100644 (file)
index 0000000..71f2e58
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/ubsan/attrib-2.c
@@ -0,0 +1,71 @@
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow" } */
+
+/* Test that we don't instrument functions marked with
+   no_sanitize_undefined attribute.  */
+
+#ifndef __cplusplus
+#define bool _Bool
+#endif
+enum A { B = -3, C = 2 } a;
+bool b;
+
+__attribute__((no_sanitize_undefined))
+static void
+vla_bound (void)
+{
+  int i = -1;
+  volatile int a[i];
+}
+
+__attribute__((no_sanitize_undefined))
+static void
+si_overflow (void)
+{
+  int x = 123, y = 267;
+  volatile int z1 = x + y;
+  volatile int z2 = x - y;
+  volatile int z3 = x * y;
+  volatile int z4 = x / y;
+}
+
+__attribute__((no_sanitize_undefined))
+static void
+null (int *p)
+{
+  *p = 42;
+}
+
+__attribute__((no_sanitize_undefined))
+static void
+retrn (int *p)
+{
+  *p = 42;
+}
+
+__attribute__((no_sanitize_undefined))
+static enum A
+bool_enum (bool *p)
+{
+  *p = b;
+  return a;
+}
+
+__attribute__((no_sanitize_undefined))
+static void
+float_zero (void)
+{
+  volatile float a = 4.2f, b = 0.0f, c;
+  c = a / b;
+}
+
+__attribute__((no_sanitize_undefined))
+static void
+float_cast (void)
+{
+  volatile double d = 300;
+  volatile signed char c;
+  c = d;
+}
+
+/* { dg-final { scan-assembler-not "__ubsan_handle" } } */

diff --git a/gcc/testsuite/g++.dg/ubsan/return-3.C b/gcc/testsuite/g++.dg/ubsan/return-3.C
new file mode 100644 (file)
index 0000000..95f345d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ubsan/return-3.C
@@ -0,0 +1,27 @@
+// { dg-do compile }
+// { dg-options "-fsanitize=return" }
+
+struct S { S (); ~S (); };
+
+S::S () {}
+S::~S () {}
+
+__attribute__((no_sanitize_undefined))
+int
+foo (int x)
+{
+  S a;
+  {
+    S b;
+    if (x)
+      return 1;
+  }
+}
+
+int
+main ()
+{
+  foo (0);
+}
+
+// { dg-final { scan-assembler-not "__ubsan_handle" } }

diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 5e1c3e7c9ed5931d5c4559c35c79171f37a4468e..11d2a889cc83f9a71ef6498c7e731d9a5745eaa1 100644 (file)
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -1148,7 +1148,10 @@ public:
   virtual bool gate (function *)
     {
       return flag_sanitize & (SANITIZE_NULL | SANITIZE_SI_OVERFLOW
-                             | SANITIZE_BOOL | SANITIZE_ENUM);
+                             | SANITIZE_BOOL | SANITIZE_ENUM)
+            && current_function_decl != NULL_TREE
+            && !lookup_attribute ("no_sanitize_undefined",
+                                  DECL_ATTRIBUTES (current_function_decl));
     }
 
   virtual unsigned int execute (function *);