Simplify stack-allocated Lisp objects, and make them more portable.

The build_local_string macro was used in two ways: (1) string
literals for which scoped allocation suffices, and (2) file name
components, where it's not safe in general to assume bounded-size
ASCII data.  Simplify by defining a new macro SCOPED_STRING that
allocates a block-scope string, and by using SCOPED_STRING for (1)
and build_string for (2).  Furthermore, actually use stack
allocation only for objects known to have sufficient alignment.
This simpler implementation means Emacs can make
USE_STACK_LISP_OBJECTS the default unless GC_MARK_STACK !=
GC_MAKE_GCPROS_NOOPS.
* lisp.h (GCALIGNED): Align even if !USE_STACK_LISP_OBJECTS,
for fewer differences among implementations.
(struct Lisp_String): Now GCALIGNED.
(USE_STACK_LISP_OBJECTS): Default to true, since the
implementation no longer insists on a nonempty GCALIGNED.
But make it false if GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS.
(SCOPED_CONS_INITIALIZER): Remove, since it's no longer needed
separately.  Move definiens to scoped_cons.  The old definition
was incorrect when GCALIGNED was defined to be empty.
(union Aligned_String): New type.
(USE_STACK_CONS, USE_STACK_STRING): New constants, so that the
implementation ports to compilers that don't align strictly enough.
Don't worry about the union sizes; it's not worth bothering about.
(scoped_cons, scoped_list1, scoped_list3, scoped_list4):
Rewrite using USE_STACK_CONS.
(scoped_cons): Assume the use of union Aligned_Cons.
(lisp_string_size, make_local_string, build_local_string): Remove.
Unless otherwise specified, all callers of build_local_string
changed to use SCOPED_STRING.
(SCOPED_STRING): New macro.
* data.c (wrong_choice):
* menu.c (single_menu_item):
* process.c (Fformat_network_address):
Hoist use of SCOPED_STRING out of a scope, so that its returned
object lives long enough.
* fileio.c (Fexpand_file_name): Use build_string, not SCOPED_STRING,
as the string might be long or might not be ASCII.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 8d52b2a2815..8a0e28a2e1a 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10937,8 +10937,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
         {
           Lisp_Object value;
           value = display_x_get_resource
-            (dpyinfo, build_local_string ("privateColormap"),
-             build_local_string ("PrivateColormap"), Qnil, Qnil);
+            (dpyinfo, SCOPED_STRING ("privateColormap"),
+             SCOPED_STRING ("PrivateColormap"), Qnil, Qnil);
           if (STRINGP (value)
               && (!strcmp (SSDATA (value), "true")
                   || !strcmp (SSDATA (value), "on")))
@@ -11146,8 +11146,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
      for debugging X code.  */
   {
     Lisp_Object value = display_x_get_resource
-      (dpyinfo, build_local_string ("synchronous"),
-       build_local_string ("Synchronous"), Qnil, Qnil);
+      (dpyinfo, SCOPED_STRING ("synchronous"),
+       SCOPED_STRING ("Synchronous"), Qnil, Qnil);
     if (STRINGP (value)
         && (!strcmp (SSDATA (value), "true")
             || !strcmp (SSDATA (value), "on")))
@@ -11156,8 +11156,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 
   {
     Lisp_Object value = display_x_get_resource
-      (dpyinfo, build_local_string ("useXIM"),
-       build_local_string ("UseXIM"), Qnil, Qnil);
+      (dpyinfo, SCOPED_STRING ("useXIM"),
+       SCOPED_STRING ("UseXIM"), Qnil, Qnil);
 #ifdef USE_XIM
     if (STRINGP (value)
         && (!strcmp (SSDATA (value), "false")