* Move #undef DEF_INTERNAL_FN to internal-fn.def
@ 2015-11-06 15:30 Richard Sandiford
2015-11-06 16:18 ` Jeff Law
0 siblings, 1 reply; 2+ messages in thread
From: Richard Sandiford @ 2015-11-06 15:30 UTC (permalink / raw)
To: gcc-patches
In practice the definition of DEF_INTERNAL_FN is never reused after
including internal-fn.def, so we might as well #undef it there.
This becomes more obvious with a later patch that adds other
DEF_INTERNAL_* directives, such as DEF_INTERNAL_OPTAB_FN.
If the includer doesn't care about the information carried in
these new directives, it can simply leave the macro undefined
and internals.def will provide a definition that forwards to
DEF_INTERNAL_FN. It doesn't make much sense for includers to have
to #undef macros that are defined by internals.def and it seems overly
complicated to get internals.def to undef macros only in the cases
where it provided a definition. Instead I went with the approach of
#undeffing all the DEF_INTERNAL_* macros unconditionally.
Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi.
OK to install?
Thanks,
Richard
gcc/
* internal-fn.def: #undef DEF_INTERNAL_FN at the end.
* internal-fn.c: Don't undef it here.
* tree-core.h: Likewise.
diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c
index a7da373..f9f7746 100644
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.c
@@ -43,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
const char *const internal_fn_name_array[] = {
#define DEF_INTERNAL_FN(CODE, FLAGS, FNSPEC) #CODE,
#include "internal-fn.def"
-#undef DEF_INTERNAL_FN
"<invalid-fn>"
};
@@ -51,7 +50,6 @@ const char *const internal_fn_name_array[] = {
const int internal_fn_flags_array[] = {
#define DEF_INTERNAL_FN(CODE, FLAGS, FNSPEC) FLAGS,
#include "internal-fn.def"
-#undef DEF_INTERNAL_FN
0
};
@@ -65,7 +63,6 @@ init_internal_fns ()
if (FNSPEC) internal_fn_fnspec_array[IFN_##CODE] = \
build_string ((int) sizeof (FNSPEC), FNSPEC ? FNSPEC : "");
#include "internal-fn.def"
-#undef DEF_INTERNAL_FN
internal_fn_fnspec_array[IFN_LAST] = 0;
}
@@ -2054,7 +2051,6 @@ expand_GOACC_LOOP (gcall *stmt ATTRIBUTE_UNUSED)
static void (*const internal_fn_expanders[]) (gcall *) = {
#define DEF_INTERNAL_FN(CODE, FLAGS, FNSPEC) expand_##CODE,
#include "internal-fn.def"
-#undef DEF_INTERNAL_FN
0
};
diff --git a/gcc/internal-fn.def b/gcc/internal-fn.def
index 78266d9..a2da2dd 100644
--- a/gcc/internal-fn.def
+++ b/gcc/internal-fn.def
@@ -83,3 +83,5 @@ DEF_INTERNAL_FN (GOACC_DIM_POS, ECF_PURE | ECF_NOTHROW | ECF_LEAF, ".")
/* OpenACC looping abstraction. See internal-fn.h for usage. */
DEF_INTERNAL_FN (GOACC_LOOP, ECF_PURE | ECF_NOTHROW, NULL)
+
+#undef DEF_INTERNAL_FN
diff --git a/gcc/tree-core.h b/gcc/tree-core.h
index 6b17da7..1c6976e 100644
--- a/gcc/tree-core.h
+++ b/gcc/tree-core.h
@@ -768,7 +768,6 @@ enum annot_expr_kind {
enum internal_fn {
#define DEF_INTERNAL_FN(CODE, FLAGS, FNSPEC) IFN_##CODE,
#include "internal-fn.def"
-#undef DEF_INTERNAL_FN
IFN_LAST
};
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Move #undef DEF_INTERNAL_FN to internal-fn.def
2015-11-06 15:30 Move #undef DEF_INTERNAL_FN to internal-fn.def Richard Sandiford
@ 2015-11-06 16:18 ` Jeff Law
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Law @ 2015-11-06 16:18 UTC (permalink / raw)
To: gcc-patches, richard.sandiford
On 11/06/2015 08:30 AM, Richard Sandiford wrote:
> In practice the definition of DEF_INTERNAL_FN is never reused after
> including internal-fn.def, so we might as well #undef it there.
>
> This becomes more obvious with a later patch that adds other
> DEF_INTERNAL_* directives, such as DEF_INTERNAL_OPTAB_FN.
> If the includer doesn't care about the information carried in
> these new directives, it can simply leave the macro undefined
> and internals.def will provide a definition that forwards to
> DEF_INTERNAL_FN. It doesn't make much sense for includers to have
> to #undef macros that are defined by internals.def and it seems overly
> complicated to get internals.def to undef macros only in the cases
> where it provided a definition. Instead I went with the approach of
> #undeffing all the DEF_INTERNAL_* macros unconditionally.
>
> Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi.
> OK to install?
>
> Thanks,
> Richard
>
>
> gcc/
> * internal-fn.def: #undef DEF_INTERNAL_FN at the end.
> * internal-fn.c: Don't undef it here.
> * tree-core.h: Likewise.
>
OK.
jeff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-06 16:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-06 15:30 Move #undef DEF_INTERNAL_FN to internal-fn.def Richard Sandiford
2015-11-06 16:18 ` Jeff Law
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).