aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2011-06-06 10:32:11 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2011-06-06 10:32:11 +0000
commit5c4a1c7b20dfd908f43951e16ff2679a4b184d1a (patch)
tree29d531f11d570bb390201a3233ee61d76d77c27e
parente9f57686fcfaf04788a27d6433e7bf727d08001c (diff)
downloadgcc-5c4a1c7b20dfd908f43951e16ff2679a4b184d1a.zip
gcc-5c4a1c7b20dfd908f43951e16ff2679a4b184d1a.tar.gz
gcc-5c4a1c7b20dfd908f43951e16ff2679a4b184d1a.tar.bz2
utils2.c (gnat_stabilize_reference): Fix thinko.
* gcc-interface/utils2.c (gnat_stabilize_reference) <COMPOUND_EXPR>: Fix thinko. From-SVN: r174690
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/gcc-interface/utils2.c4
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gnat.dg/specs/cond_expr1.ads9
4 files changed, 20 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6587ffd..ac77086 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
2011-06-06 Eric Botcazou <ebotcazou@adacore.com>
+ * gcc-interface/utils2.c (gnat_stabilize_reference) <COMPOUND_EXPR>:
+ Fix thinko.
+
+2011-06-06 Eric Botcazou <ebotcazou@adacore.com>
+
* gcc-interface/trans.c (Identifier_to_gnu): Also handle deferred
constants whose full view has discriminants specially.
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c
index db19032..2a455d1 100644
--- a/gcc/ada/gcc-interface/utils2.c
+++ b/gcc/ada/gcc-interface/utils2.c
@@ -2518,8 +2518,8 @@ gnat_stabilize_reference (tree ref, bool force, bool *success)
result = build2 (COMPOUND_EXPR, type,
gnat_stabilize_reference (TREE_OPERAND (ref, 0), force,
success),
- gnat_stabilize_reference_1 (TREE_OPERAND (ref, 1),
- force));
+ gnat_stabilize_reference (TREE_OPERAND (ref, 1), force,
+ success));
break;
case CONSTRUCTOR:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 131da5e..1e904e6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2011-06-06 Eric Botcazou <ebotcazou@adacore.com>
+ * gnat.dg/specs/cond_expr1.ads: New test.
+
+2011-06-06 Eric Botcazou <ebotcazou@adacore.com>
+
* gnat.dg/deferred_const4.ad[sb]: New test.
* gnat.dg/deferred_const4_pkg.ads: New helper.
diff --git a/gcc/testsuite/gnat.dg/specs/cond_expr1.ads b/gcc/testsuite/gnat.dg/specs/cond_expr1.ads
new file mode 100644
index 0000000..01d76d0
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/specs/cond_expr1.ads
@@ -0,0 +1,9 @@
+-- { dg-do compile }
+-- { dg-options "-gnat12 -gnato" }
+
+package Cond_Expr1 is
+
+ function Tail (S : String) return String is
+ (if S'Last <= S'First then "" else S (S'First + 1 .. S'Last));
+
+end Cond_Expr1;