aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2017-02-24 10:35:14 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2017-02-24 10:35:14 +0000
commit0b9cdb9a4011886f0166a648f874f880ac9e026a (patch)
tree04365f8d042241b4ca4cce48a5150fecfa9db312 /gcc/ada
parent59909673d11f6e1a0655c360c96653e9b0a37b84 (diff)
downloadgcc-0b9cdb9a4011886f0166a648f874f880ac9e026a.zip
gcc-0b9cdb9a4011886f0166a648f874f880ac9e026a.tar.gz
gcc-0b9cdb9a4011886f0166a648f874f880ac9e026a.tar.bz2
* gcc-interface/trans.c (return_value_ok_for_nrv_p): Add sanity check.
From-SVN: r245701
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/gcc-interface/trans.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c7b1ef0..44e525a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,9 @@
2017-02-24 Eric Botcazou <ebotcazou@adacore.com>
+ * gcc-interface/trans.c (return_value_ok_for_nrv_p): Add sanity check.
+
+2017-02-24 Eric Botcazou <ebotcazou@adacore.com>
+
* gcc-interface/decl.c: Include demangle.h.
(is_cplusplus_method): Return again true for a primitive operation
only if it is dispatching. For a subprogram with an interface name,
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 7cde230..d38a0a9 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -3614,9 +3614,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;
}