From: Marek Polacek <polacek@redhat.com>
Date: Mon, 9 Mar 2015 11:57:33 +0000 (+0000)
Subject: c-convert.c (convert): Make use of do_ubsan_in_current_function.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=802ac282f819054e10ac5dca06881b6dca909cdb;p=gcc.git

c-convert.c (convert): Make use of do_ubsan_in_current_function.

	* c-convert.c (convert): Make use of do_ubsan_in_current_function.
	* c-decl.c (grokdeclarator): Likewise.
	* c-typeck.c (build_binary_op): Likewise.

From-SVN: r221278
---

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 7152fc0d6c1..a5fcb35e32f 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-09  Marek Polacek  <polacek@redhat.com>
+
+	* c-convert.c (convert): Make use of do_ubsan_in_current_function.
+	* c-decl.c (grokdeclarator): Likewise.
+	* c-typeck.c (build_binary_op): Likewise.
+
 2015-02-27  Marek Polacek  <polacek@redhat.com>
 
 	PR c/65228
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index 2cb53f748d6..27fc3fc0e8e 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -121,9 +121,7 @@ convert (tree type, tree expr)
       if (flag_sanitize & SANITIZE_FLOAT_CAST
 	  && TREE_CODE (TREE_TYPE (expr)) == REAL_TYPE
 	  && COMPLETE_TYPE_P (type)
-	  && current_function_decl != NULL_TREE
-	  && !lookup_attribute ("no_sanitize_undefined",
-				DECL_ATTRIBUTES (current_function_decl)))
+	  && do_ubsan_in_current_function ())
 	{
 	  tree arg;
 	  if (in_late_binary_op)
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 749785801ee..c140837f139 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -5837,10 +5837,7 @@ grokdeclarator (const struct c_declarator *declarator,
 		    warn_variable_length_array (name, size);
 		    if (flag_sanitize & SANITIZE_VLA
 		        && decl_context == NORMAL
-			&& current_function_decl != NULL_TREE
-			&& !lookup_attribute ("no_sanitize_undefined",
-					      DECL_ATTRIBUTES
-						(current_function_decl)))
+			&& do_ubsan_in_current_function ())
 		      {
 			/* Evaluate the array size only once.  */
 			size = c_save_expr (size);
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index a3a9c7760c7..7c6d974a486 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -11229,9 +11229,7 @@ build_binary_op (location_t location, enum tree_code code,
 
   if ((flag_sanitize & (SANITIZE_SHIFT | SANITIZE_DIVIDE
 			| SANITIZE_FLOAT_DIVIDE))
-      && current_function_decl != 0
-      && !lookup_attribute ("no_sanitize_undefined",
-			    DECL_ATTRIBUTES (current_function_decl))
+      && do_ubsan_in_current_function ()
       && (doing_div_or_mod || doing_shift))
     {
       /* OP0 and/or OP1 might have side-effects.  */