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

diff --git a/ChangeLog.name-lookup b/ChangeLog.name-lookup
index 2ac60f044a7ceca778d50eab89c3c9047d327da6..86a6d2d8791527de821fab4bd427d574b4ec8440 100644 (file)
--- a/ChangeLog.name-lookup
+++ b/ChangeLog.name-lookup
@@ -1,5 +1,13 @@
 2018-08-01  Nathan Sidwell  <nathan@acm.org>
 
+       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 85e3faa4df70befd6ee23ef654572fe47dfa7dd8..4b3c2802549fb4e8a95886718be1e526ced5dab3 100644 (file)
--- 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 807ad7062d792d376aaefbf62831d575e5ded9bd..dc1462dafb8ae274b81abdff09b0661e6c9c8b69 100644 (file)
--- 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 7166f2544a143926fe38376fbb32684dcd93f80a..7f374dd32b26e0a4b3c79966d5e6a7a4391a9594 100644 (file)
--- 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;