From: Andi Kleen <ak@linux.intel.com>
To: gcc-patches@gcc.gnu.org
Cc: richard.guenther@gmail.com, nathan@acm.org, josmyers@redhat.com,
richard.sandiford@arm.com, jason@redhat.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v7 8/9] Give better error messages for musttail
Date: Sun, 2 Jun 2024 10:16:52 -0700 [thread overview]
Message-ID: <20240602172205.2151579-9-ak@linux.intel.com> (raw)
In-Reply-To: <20240602172205.2151579-1-ak@linux.intel.com>
When musttail is set, make tree-tailcall to give error messages
when it cannot handle a call. This avoids vague "other reasons"
error messages later at expand time.
This doesn't always work, for example when find_tail_call
walking gives up because the control flow is too complicated
then it won't find the tail call and can't give a suitable
error message.
gcc/ChangeLog:
* tree-tailcall.cc (maybe_error_musttail): Add.
(bb_get_succ_edge_count): Add.
(find_tail_calls): Add error messages. Keep searching
for basic blocks with multiple BBs if all but one is EH
only.
---
gcc/tree-tailcall.cc | 70 +++++++++++++++++++++++++++++++++++++++-----
1 file changed, 62 insertions(+), 8 deletions(-)
diff --git a/gcc/tree-tailcall.cc b/gcc/tree-tailcall.cc
index 094856de22ef..d315be554418 100644
--- a/gcc/tree-tailcall.cc
+++ b/gcc/tree-tailcall.cc
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "ipa-utils.h"
#include "tree-ssa-live.h"
+#include "diagnostic-core.h"
/* The file implements the tail recursion elimination. It is also used to
analyze the tail calls in general, passing the results to the rtl level
@@ -402,6 +403,36 @@ propagate_through_phis (tree var, edge e)
return var;
}
+/* Report an error for failing to tail convert must call CALL
+ with error message ERR. */
+
+static void
+maybe_error_musttail (gcall *call, const char *err)
+{
+ if (gimple_call_must_tail_p (call))
+ {
+ error_at (call->location, "cannot tail-call: %s", err);
+ gimple_call_set_must_tail (call, false); /* Avoid another error. */
+ gimple_call_set_tail (call, false);
+ }
+}
+
+/* Count succ edges for BB and return in NUM_OTHER and NUM_EH. */
+
+static void
+bb_get_succ_edge_count (basic_block bb, int &num_other, int &num_eh)
+{
+ edge e;
+ edge_iterator ei;
+ num_eh = 0;
+ num_other = 0;
+ FOR_EACH_EDGE (e, ei, bb->succs)
+ if (e->flags & EDGE_EH)
+ num_eh++;
+ else
+ num_other++;
+}
+
/* Argument for compute_live_vars/live_vars_at_stmt and what compute_live_vars
returns. Computed lazily, but just once for the function. */
static live_vars_map *live_vars;
@@ -426,7 +457,14 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail)
tree var;
if (!single_succ_p (bb))
- return;
+ {
+ int num_eh, num_other;
+ bb_get_succ_edge_count (bb, num_eh, num_other);
+ /* Allow a single EH edge so that we can give a better
+ error message later. */
+ if (!(num_eh == 1 && num_other == 1))
+ return;
+ }
for (gsi = gsi_last_bb (bb); !gsi_end_p (gsi); gsi_prev (&gsi))
{
@@ -489,13 +527,20 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail)
if (ass_var
&& !is_gimple_reg (ass_var)
&& !auto_var_in_fn_p (ass_var, cfun->decl))
- return;
+ {
+ maybe_error_musttail (call, "complex return value");
+ return;
+ }
/* If the call might throw an exception that wouldn't propagate out of
cfun, we can't transform to a tail or sibling call (82081). */
if (stmt_could_throw_p (cfun, stmt)
&& !stmt_can_throw_external (cfun, stmt))
+ {
+ maybe_error_musttail (call,
+ "call may throw exception that does not propagate");
return;
+ }
/* If the function returns a value, then at present, the tail call
must return the same type of value. There is conceptually a copy
@@ -524,7 +569,10 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail)
if (result_decl
&& may_be_aliased (result_decl)
&& ref_maybe_used_by_stmt_p (call, result_decl, false))
- return;
+ {
+ maybe_error_musttail (call, "tail call must be same type");
+ return;
+ }
/* We found the call, check whether it is suitable. */
tail_recursion = false;
@@ -605,6 +653,7 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail)
{
if (local_live_vars)
BITMAP_FREE (local_live_vars);
+ maybe_error_musttail (call, "call invocation refers to locals");
return;
}
else
@@ -613,6 +662,7 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail)
if (bitmap_bit_p (local_live_vars, *v))
{
BITMAP_FREE (local_live_vars);
+ maybe_error_musttail (call, "call invocation refers to locals");
return;
}
}
@@ -663,12 +713,13 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail)
/* This is a gimple assign. */
par ret = process_assignment (as_a <gassign *> (stmt), gsi,
&tmp_m, &tmp_a, &ass_var, to_move_defs);
- if (ret == FAIL)
- return;
+ if (ret == FAIL || (ret == TRY_MOVE && !tail_recursion))
+ {
+ maybe_error_musttail (call, "return value changed after call");
+ return;
+ }
else if (ret == TRY_MOVE)
{
- if (! tail_recursion)
- return;
/* Do not deal with checking dominance, the real fix is to
do path isolation for the transform phase anyway, removing
the need to compute the accumulators with new stmts. */
@@ -716,7 +767,10 @@ find_tail_calls (basic_block bb, struct tailcall **ret, bool only_musttail)
if (ret_var
&& (ret_var != ass_var
&& !(is_empty_type (TREE_TYPE (ret_var)) && !ass_var)))
- return;
+ {
+ maybe_error_musttail (call, "call must be the same type");
+ return;
+ }
/* If this is not a tail recursive call, we cannot handle addends or
multiplicands. */
--
2.44.0
next prev parent reply other threads:[~2024-06-02 17:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-02 17:16 Updated musttail patchkit Andi Kleen
2024-06-02 17:16 ` [PATCH v7 1/9] Improve must tail in RTL backend Andi Kleen
2024-06-10 0:55 ` [PING] " Andi Kleen
2024-06-14 13:43 ` [PING^2] " Andi Kleen
2024-06-20 18:13 ` [PING^3] " Andi Kleen
2024-06-02 17:16 ` [PATCH v7 2/9] Fix pro_and_epilogue for sibcalls at -O0 Andi Kleen
2024-06-02 17:30 ` Andrew Pinski
2024-06-02 20:27 ` Andi Kleen
2024-06-02 17:16 ` [PATCH v7 3/9] Add a musttail generic attribute to the c-attribs table Andi Kleen
2024-06-02 17:16 ` [PATCH v7 4/9] C++: Support clang compatible [[musttail]] (PR83324) Andi Kleen
2024-06-03 14:42 ` Jason Merrill
2024-06-03 15:33 ` Andi Kleen
2024-06-03 15:44 ` Jakub Jelinek
2024-06-03 16:29 ` Jason Merrill
2024-06-03 19:35 ` Andi Kleen
2024-06-03 20:27 ` Jason Merrill
2024-06-04 0:17 ` Andi Kleen
2024-06-02 17:16 ` [PATCH v7 5/9] C: Implement musttail attribute for returns Andi Kleen
2024-06-02 17:16 ` [PATCH v7 6/9] Add tests for C/C++ musttail attributes Andi Kleen
2024-06-03 14:46 ` Jason Merrill
2024-06-02 17:16 ` [PATCH v7 7/9] Enable musttail tail conversion even when not optimizing Andi Kleen
2024-06-02 17:16 ` Andi Kleen [this message]
2024-06-02 17:16 ` [PATCH v7 9/9] Add documentation for musttail attribute Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240602172205.2151579-9-ak@linux.intel.com \
--to=ak@linux.intel.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=josmyers@redhat.com \
--cc=nathan@acm.org \
--cc=richard.guenther@gmail.com \
--cc=richard.sandiford@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).