From: Ilya Enkovich <enkovich.gnu@gmail.com>
Date: Thu, 3 Dec 2015 10:35:41 +0000 (+0000)
Subject: cfgexpand.c (expand_gimple_stmt_1): Return statement with DECL as return value is... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5be36b1dba767987999e7fac5af85022e97c113;p=gcc.git

cfgexpand.c (expand_gimple_stmt_1): Return statement with DECL as return value is allowed to have NULL bounds.

gcc/

	* cfgexpand.c (expand_gimple_stmt_1): Return statement with
	DECL as return value is allowed to have NULL bounds.

From-SVN: r231224
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 35554453267..c576908d996 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-03  Ilya Enkovich  <enkovich.gnu@gmail.com>
+
+	* cfgexpand.c (expand_gimple_stmt_1): Return statement with
+	DECL as return value is allowed to have NULL bounds.
+
 2015-12-03  Tom de Vries  <tom@codesourcery.com>
 
 	* graphite-isl-ast-to-gimple.c (binary_op_to_tree)
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 1990e107db6..2c3b23d6244 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -3534,6 +3534,12 @@ expand_gimple_stmt_1 (gimple *stmt)
 	  {
 	    tree result = DECL_RESULT (current_function_decl);
 
+	    /* Mark we have return statement with missing bounds.  */
+	    if (!bnd
+		&& chkp_function_instrumented_p (cfun->decl)
+		&& !DECL_P (op0))
+	      bnd = error_mark_node;
+
 	    /* If we are not returning the current function's RESULT_DECL,
 	       build an assignment to it.  */
 	    if (op0 != result)
@@ -3550,9 +3556,6 @@ expand_gimple_stmt_1 (gimple *stmt)
 		op0 = build2 (MODIFY_EXPR, TREE_TYPE (result),
 			      result, op0);
 	      }
-	    /* Mark we have return statement with missing bounds.  */
-	    if (!bnd && chkp_function_instrumented_p (cfun->decl))
-	      bnd = error_mark_node;
 	  }
 
 	if (!op0)