public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-9247] d: Delay removing DECL_EXTERNAL from thunks until funcion has finished
@ 2023-03-13 21:19 Iain Buclaw
0 siblings, 0 replies; only message in thread
From: Iain Buclaw @ 2023-03-13 21:19 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:bcf467a1dfa7afcde57f4c132d1b666778145c93
commit r12-9247-gbcf467a1dfa7afcde57f4c132d1b666778145c93
Author: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Mon Mar 13 22:04:24 2023 +0100
d: Delay removing DECL_EXTERNAL from thunks until funcion has finished
Second part to fixing PR109108, don't blindly generate the associated
function definition of all referenced thunks in the compilation. Just
delay finishing a thunk until the function gets codegen itself. If the
function never gets a definition, then the thunk is left as "extern".
gcc/d/ChangeLog:
* decl.cc (finish_thunk): Unset DECL_EXTERNAL on thunk.
(make_thunk): Set DECL_EXTERNAL on thunk, don't call build_decl_tree.
(finish_function): Call finish_thunk on forward referenced thunks.
(cherry picked from commit d1bddcaf15a362d88c29337295a0aaaaaa037642)
Diff:
---
gcc/d/decl.cc | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/gcc/d/decl.cc b/gcc/d/decl.cc
index 45b45954e81..f97469c6dd7 100644
--- a/gcc/d/decl.cc
+++ b/gcc/d/decl.cc
@@ -1851,6 +1851,7 @@ finish_thunk (tree thunk, tree function)
TREE_ADDRESSABLE (function) = 1;
TREE_USED (function) = 1;
+ DECL_EXTERNAL (thunk) = 0;
if (flag_syntax_only)
{
@@ -1922,21 +1923,14 @@ make_thunk (FuncDeclaration *decl, int offset)
if (!DECL_ARGUMENTS (function) || !DECL_RESULT (function))
{
- /* Compile the function body before generating the thunk, this is done
- even if the decl is external to the current module. */
- if (decl->fbody)
- build_decl_tree (decl);
- else
- {
- /* Build parameters for functions that are not being compiled,
- so that they can be correctly cloned in finish_thunk. */
- tree function = get_symbol_decl (decl);
- DECL_ARGUMENTS (function) = get_fndecl_arguments (decl);
-
- /* Also build the result decl, which is needed when force creating
- the thunk in gimple inside cgraph_node::expand_thunk. */
- DECL_RESULT (function) = get_fndecl_result (decl);
- }
+ /* Build parameters for functions that are not being compiled,
+ so that they can be correctly cloned in finish_thunk. */
+ tree function = get_symbol_decl (decl);
+ DECL_ARGUMENTS (function) = get_fndecl_arguments (decl);
+
+ /* Also build the result decl, which is needed when force creating
+ the thunk in gimple inside cgraph_node::expand_thunk. */
+ DECL_RESULT (function) = get_fndecl_result (decl);
}
/* Don't build the thunk if the compilation step failed. */
@@ -1962,11 +1956,10 @@ make_thunk (FuncDeclaration *decl, int offset)
DECL_CONTEXT (thunk) = d_decl_context (decl);
- /* Thunks inherit the public access of the function they are targeting.
- Thunks are connected to the definitions of the functions, so thunks are
- not produced for external functions. */
+ /* Thunks inherit the public access of the function they are targeting. */
TREE_PUBLIC (thunk) = TREE_PUBLIC (function);
- DECL_EXTERNAL (thunk) = DECL_EXTERNAL (function);
+ /* The thunk has not been defined -- yet. */
+ DECL_EXTERNAL (thunk) = 1;
/* Thunks are always addressable. */
TREE_ADDRESSABLE (thunk) = 1;
@@ -2006,6 +1999,8 @@ make_thunk (FuncDeclaration *decl, int offset)
if (decl->resolvedLinkage () != LINK::cpp)
free (CONST_CAST (char *, ident));
+ /* Thunks are connected to the definitions of the functions, so thunks are
+ not produced for external functions. */
if (!DECL_EXTERNAL (function))
finish_thunk (thunk, function);
@@ -2115,6 +2110,10 @@ finish_function (tree old_context)
DECL_SAVED_TREE (fndecl) = bind;
+ /* Finish any forward referenced thunks for the function. */
+ for (tree t = DECL_LANG_THUNKS (fndecl); t; t = DECL_CHAIN (t))
+ finish_thunk (t, fndecl);
+
if (!errorcount && !global.errors)
{
/* Dump the D-specific tree IR. */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-03-13 21:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-13 21:19 [gcc r12-9247] d: Delay removing DECL_EXTERNAL from thunks until funcion has finished Iain Buclaw
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).