From b10bd71987cdeb753c106145d6270a359505359c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 22 Dec 2016 09:25:58 -0800 Subject: Pacify --enable-gcc-warnings * src/charset.c (load_charset_map): * src/coding.c (decode_coding_object): * src/frame.c (make_frame): * src/window.c (Frecenter): Mark locals with UNINIT to silence false alarms from -Wmaybe-uninitialized. * src/lisp.h (SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD) (SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): Check and assume that values are nonnull. This pacifies -Wmaybe-uninitialized in Fmake_variable_buffer_local and Fmake_local_variable. --- src/lisp.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lisp.h') diff --git a/src/lisp.h b/src/lisp.h index 061cf179f96..79b208a333b 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1837,19 +1837,19 @@ INLINE Lisp_Object INLINE struct Lisp_Symbol * SYMBOL_ALIAS (struct Lisp_Symbol *sym) { - eassert (sym->redirect == SYMBOL_VARALIAS); + eassume (sym->redirect == SYMBOL_VARALIAS && sym->val.alias); return sym->val.alias; } INLINE struct Lisp_Buffer_Local_Value * SYMBOL_BLV (struct Lisp_Symbol *sym) { - eassert (sym->redirect == SYMBOL_LOCALIZED); + eassume (sym->redirect == SYMBOL_LOCALIZED && sym->val.blv); return sym->val.blv; } INLINE union Lisp_Fwd * SYMBOL_FWD (struct Lisp_Symbol *sym) { - eassert (sym->redirect == SYMBOL_FORWARDED); + eassume (sym->redirect == SYMBOL_FORWARDED && sym->val.fwd); return sym->val.fwd; } @@ -1862,19 +1862,19 @@ INLINE void INLINE void SET_SYMBOL_ALIAS (struct Lisp_Symbol *sym, struct Lisp_Symbol *v) { - eassert (sym->redirect == SYMBOL_VARALIAS); + eassume (sym->redirect == SYMBOL_VARALIAS && v); sym->val.alias = v; } INLINE void SET_SYMBOL_BLV (struct Lisp_Symbol *sym, struct Lisp_Buffer_Local_Value *v) { - eassert (sym->redirect == SYMBOL_LOCALIZED); + eassume (sym->redirect == SYMBOL_LOCALIZED && v); sym->val.blv = v; } INLINE void SET_SYMBOL_FWD (struct Lisp_Symbol *sym, union Lisp_Fwd *v) { - eassert (sym->redirect == SYMBOL_FORWARDED); + eassume (sym->redirect == SYMBOL_FORWARDED && v); sym->val.fwd = v; } -- cgit v1.2.3