From 0b4a2c062262cd47dce240c3198e45f17b718cbb Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 1 Aug 2018 19:42:01 +0000 Subject: [PATCH] internal.h (_cpp_construct_macro): Rename to ... libcpp/ * internal.h (_cpp_construct_macro): Rename to ... (_cpp_new_macro): ... here. Kill old declaration. * macro.c (_cpp_construct_macro): Rename to ... (_cpp_new_macro): ... here. Kill old definition. (create_iso_definition): Adjust. * traditional.c (_cpp_create_trad_definition): Adjust. From-SVN: r263234 --- ChangeLog.name-lookup | 8 ++++++++ libcpp/internal.h | 3 +-- libcpp/macro.c | 19 +++---------------- libcpp/traditional.c | 3 ++- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/ChangeLog.name-lookup b/ChangeLog.name-lookup index 2ac60f044a7c..86a6d2d87915 100644 --- a/ChangeLog.name-lookup +++ b/ChangeLog.name-lookup @@ -1,5 +1,13 @@ 2018-08-01 Nathan Sidwell + libcpp/ + * internal.h (_cpp_construct_macro): Rename to ... + (_cpp_new_macro): ... here. Kill old declaration. + * macro.c (_cpp_construct_macro): Rename to ... + (_cpp_new_macro): ... here. Kill old definition. + (create_iso_definition): Adjust. + * traditional.c (_cpp_create_trad_definition): Adjust. + Macro tokens are trailing array libcpp/ * include/cpp-id-data.h (cpp_macro): Move tokens to trailing array. diff --git a/libcpp/internal.h b/libcpp/internal.h index 85e3faa4df70..4b3c2802549f 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -622,8 +622,7 @@ cpp_in_primary_file (cpp_reader *pfile) } /* In macro.c */ -extern cpp_macro *_cpp_construct_macro (cpp_reader *, cpp_macro_kind, void *); -extern cpp_macro *_cpp_new_macro (cpp_reader *, cpp_macro_kind); +extern cpp_macro *_cpp_new_macro (cpp_reader *, cpp_macro_kind, void *); extern void _cpp_free_definition (cpp_hashnode *); extern bool _cpp_create_definition (cpp_reader *, cpp_hashnode *); extern void _cpp_pop_context (cpp_reader *); diff --git a/libcpp/macro.c b/libcpp/macro.c index 807ad7062d79..dc1462dafb8a 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -3338,9 +3338,8 @@ create_iso_definition (cpp_reader *pfile) } } - macro = _cpp_construct_macro (pfile, cmk_macro, - _cpp_reserve_room (pfile, 0, - sizeof (cpp_macro))); + macro = _cpp_new_macro (pfile, cmk_macro, + _cpp_reserve_room (pfile, 0, sizeof (cpp_macro))); if (!token) { @@ -3486,7 +3485,7 @@ create_iso_definition (cpp_reader *pfile) } cpp_macro * -_cpp_construct_macro (cpp_reader *pfile, cpp_macro_kind kind, void *placement) +_cpp_new_macro (cpp_reader *pfile, cpp_macro_kind kind, void *placement) { cpp_macro *macro = (cpp_macro *) placement; @@ -3506,18 +3505,6 @@ _cpp_construct_macro (cpp_reader *pfile, cpp_macro_kind kind, void *placement) return macro; } -cpp_macro * -_cpp_new_macro (cpp_reader *pfile, cpp_macro_kind kind) -{ - void *placement; - - if (pfile->hash_table->alloc_subobject) - placement = pfile->hash_table->alloc_subobject (sizeof (cpp_macro)); - else - placement = _cpp_aligned_alloc (pfile, sizeof (cpp_macro)); - return _cpp_construct_macro (pfile, kind, placement); -} - /* Parse a macro and save its expansion. Returns nonzero on success. */ bool _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node) diff --git a/libcpp/traditional.c b/libcpp/traditional.c index 7166f2544a14..7f374dd32b26 100644 --- a/libcpp/traditional.c +++ b/libcpp/traditional.c @@ -1209,7 +1209,8 @@ _cpp_create_trad_definition (cpp_reader *pfile) if (fun_like >= 0) { - macro = _cpp_new_macro (pfile, cmk_traditional); + macro = _cpp_new_macro (pfile, cmk_traditional, + _cpp_aligned_alloc (pfile, sizeof (cpp_macro))); macro->parm.params = params; macro->paramc = nparms; macro->fun_like = fun_like != 0; -- 2.47.2