diff options
| author | Paul Eggert | 2016-10-23 02:43:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-10-23 02:43:16 -0700 |
| commit | f39141b786525700c2619e5731c166e294265888 (patch) | |
| tree | 3f053ef7e867308aa9f41315eed9163b28e5562e /src/alloc.c | |
| parent | 241ae7a151c0cc8c09ab82d096a8b68eae16133a (diff) | |
| parent | 2deb20c1bdef2940629dc2c586d9176b9ea7e203 (diff) | |
| download | emacs-f39141b786525700c2619e5731c166e294265888.tar.gz emacs-f39141b786525700c2619e5731c166e294265888.zip | |
Merge from origin/emacs-25
2deb20c Port last_marked change to full-program optimizers
27eb668 Adapt GDB scripts to '--enable-check-lisp-object-type' builds
dac64e3 Avoid optimizing out the last_marked[] array
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index ab23072aafa..a58dc13cbd7 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6023,7 +6023,7 @@ mark_glyph_matrix (struct glyph_matrix *matrix) | |||
| 6023 | all the references contained in it. */ | 6023 | all the references contained in it. */ |
| 6024 | 6024 | ||
| 6025 | #define LAST_MARKED_SIZE 500 | 6025 | #define LAST_MARKED_SIZE 500 |
| 6026 | static Lisp_Object last_marked[LAST_MARKED_SIZE]; | 6026 | Lisp_Object last_marked[LAST_MARKED_SIZE] EXTERNALLY_VISIBLE; |
| 6027 | static int last_marked_index; | 6027 | static int last_marked_index; |
| 6028 | 6028 | ||
| 6029 | /* For debugging--call abort when we cdr down this many | 6029 | /* For debugging--call abort when we cdr down this many |