aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr56539.c7
-rw-r--r--gcc/tree-tailcall.c6
4 files changed, 20 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index caa77ae..d8e9dee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2013-03-06 Jakub Jelinek <jakub@redhat.com>
+ PR tree-optimization/56539
+ * tree-tailcall.c (adjust_return_value_with_ops): Use GSI_SAME_STMT
+ instead of GSI_CONTINUE_LINKING as last argument to
+ force_gimple_operand_gsi. Adjust function comment.
+
* config/aarch64/t-aarch64 (TM_H, OPTIONS_H_EXTRA): Add
aarch64-cores.def.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e2aa7af..7e68863 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-06 Jakub Jelinek <jakub@redhat.com>
+
+ PR tree-optimization/56539
+ * gcc.c-torture/compile/pr56539.c: New test.
+
2013-03-06 Kai Tietz <ktietz@redhat.com>
* gcc.dg/lto/20090914-2_0.c: Skip for mingw and cygwin
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr56539.c b/gcc/testsuite/gcc.c-torture/compile/pr56539.c
new file mode 100644
index 0000000..0fba96f
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr56539.c
@@ -0,0 +1,7 @@
+/* PR tree-optimization/56539 */
+
+short
+foo (const char *x, unsigned y)
+{
+ return y > 1 ? (x[y - 1] - '0') + 10 * foo (x, y - 1) : (*x - '0');
+}
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 80c0521..c6581dc 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -599,8 +599,8 @@ add_successor_phi_arg (edge e, tree var, tree phi_arg)
}
/* Creates a GIMPLE statement which computes the operation specified by
- CODE, OP0 and OP1 to a new variable with name LABEL and inserts the
- statement in the position specified by GSI and UPDATE. Returns the
+ CODE, ACC and OP1 to a new variable with name LABEL and inserts the
+ statement in the position specified by GSI. Returns the
tree node of the statement's result. */
static tree
@@ -622,7 +622,7 @@ adjust_return_value_with_ops (enum tree_code code, const char *label,
fold_convert (TREE_TYPE (op1), acc),
op1));
rhs = force_gimple_operand_gsi (&gsi, rhs,
- false, NULL, true, GSI_CONTINUE_LINKING);
+ false, NULL, true, GSI_SAME_STMT);
stmt = gimple_build_assign (result, rhs);
}