* cpplib.h (struct cpp_reader): Remove references to string_pool

        and temp_string_pool.
        * cppinit.c (cpp_create_reader, cpp_cleanup): Similarly; using
        ident_pool in place.
        * cpplex.c (parse_number, unescaped_terminator_p, parse_string,
        save_comment, cpp_token_as_text): Similarly.
        * cpplib.c (do_define, glue_header_name, parse_assertion): Similarly.
        * cppmacro.c (make_number_token, builtin_macro, lock_pools,
        unlock_pools, stringify_arg, paste_tokens): Similarly.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38336 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 11 deletions

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index a032f7be24d..76d6cc3c580 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -457,15 +457,9 @@ do_define (pfile)
 
   if (node)
     {
-      /* Use the permanent pool for storage.  */
-      pfile->string_pool = &pfile->ident_pool;
-
       if (_cpp_create_definition (pfile, node))
 	if (pfile->cb.define)
 	  (*pfile->cb.define) (pfile, node);
-
-      /* Revert to the temporary pool.  */
-      pfile->string_pool = &pfile->temp_string_pool;
     }
 }
 
@@ -531,7 +525,7 @@ glue_header_name (pfile, header)
     cpp_error (pfile, "missing terminating > character");
   else
     {
-      token_mem = _cpp_pool_alloc (pfile->string_pool, total_len);
+      token_mem = _cpp_pool_alloc (&pfile->ident_pool, total_len);
       memcpy (token_mem, buffer, total_len);
 
       header->type = CPP_HEADER_NAME;
@@ -1487,9 +1481,6 @@ parse_assertion (pfile, answerp, type)
   /* We don't expand predicates or answers.  */
   pfile->state.prevent_expansion++;
 
-  /* Use the permanent pool for storage (for the answers).  */
-  pfile->string_pool = &pfile->ident_pool;
-
   *answerp = 0;
   cpp_get_token (pfile, &predicate);
   if (predicate.type == CPP_EOF)
@@ -1507,7 +1498,6 @@ parse_assertion (pfile, answerp, type)
       result = cpp_lookup (pfile, sym, len + 1);
     }
 
-  pfile->string_pool = &pfile->temp_string_pool;
   pfile->state.prevent_expansion--;
   return result;
 }