From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 24 Feb 2017 10:40:56 +0000 (+0000)
Subject: * gcc-interface/trans.c (return_value_ok_for_nrv_p): Add sanity check.
X-Git-Tag: releases/gcc-5.5.0~503
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50c86b6887243040855170a93cc7d340fa88cb17;p=thirdparty%2Fgcc.git

* gcc-interface/trans.c (return_value_ok_for_nrv_p): Add sanity check.

From-SVN: r245703
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8f904d3b2619..950fed95d1bf 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2017-02-24  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (return_value_ok_for_nrv_p): Add sanity check.
+
 2016-11-22  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc-interface/Make-lang.in (check-acats): Fix detection
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index d14298944842..fa4940a90fb5 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -3499,9 +3499,16 @@ return_value_ok_for_nrv_p (tree ret_obj, tree ret_val)
   if (TREE_ADDRESSABLE (ret_val))
     return false;
 
+  /* For the constrained case, test for overalignment.  */
   if (ret_obj && DECL_ALIGN (ret_val) > DECL_ALIGN (ret_obj))
     return false;
 
+  /* For the unconstrained case, test for bogus initialization.  */
+  if (!ret_obj
+      && DECL_INITIAL (ret_val)
+      && TREE_CODE (DECL_INITIAL (ret_val)) == NULL_EXPR)
+    return false;
+
   return true;
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3fb7dba7672d..fe526b4df404 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2017-02-24  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt63.adb: New test.
+
 2017-02-22  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gnat.dg/opt63.adb b/gcc/testsuite/gnat.dg/opt63.adb
new file mode 100644
index 000000000000..6471be40bbdc
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/opt63.adb
@@ -0,0 +1,19 @@
+-- { dg-do compile }
+-- { dg-options "-O -gnatws" }
+
+procedure Opt63 is
+
+   type T_MOD is mod 2**32;
+   subtype T_INDEX is T_MOD range 3_000_000_000 .. 4_000_000_000;
+   type T_ARRAY is array(T_INDEX range <>) of INTEGER;
+
+   function Build_Crash(First : T_INDEX; Length : NATURAL) return T_ARRAY is
+      R : T_ARRAY(First .. T_Index'Val (T_Index'Pos (First) + Length))
+             := (others => -1); -- Crash here
+   begin
+      return R;
+   end;
+
+begin
+   null;
+end;