1 files changed, 10 insertions, 4 deletions

diff --git a/src/lisp.h b/src/lisp.h
index ac7346c5386..1ff8f83270b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1413,15 +1413,21 @@ struct Lisp_Save_Value
     } data[4];
   };
 
-/* Compatibility macro to set and extract saved pointer.  */
+/* Macro to set and extract Nth saved pointer.  Type
+   checking is ugly because it's used as an lvalue.  */
 
-#define XSAVE_POINTER(obj) XSAVE_VALUE (obj)->data[0].pointer
+#define XSAVE_POINTER(obj, n)                                   \
+  XSAVE_VALUE (obj)->data[(eassert (XSAVE_VALUE (obj)->type     \
+    ## n == SAVE_POINTER), n)].pointer
 
 /* Likewise for the saved integer.  */
 
-#define XSAVE_INTEGER(obj) XSAVE_VALUE (obj)->data[1].integer
+#define XSAVE_INTEGER(obj, n)                                   \
+  XSAVE_VALUE (obj)->data[(eassert (XSAVE_VALUE (obj)->type     \
+    ## n == SAVE_INTEGER), n)].integer
 
-/* Macro to extract Nth saved object.  */
+/* Macro to extract Nth saved object.  This is never used as
+   an lvalue, so we can do more convenient type checking.  */
 
 #define XSAVE_OBJECT(obj, n)                                    \
   (eassert (XSAVE_VALUE (obj)->type ## n == SAVE_OBJECT),       \