Mercurial > emacs
changeset 57099:569cd6a5babd
(BYTE_CODE_QUIT): Add missing AFTER_POTENTIAL_GC.
(Fbyte_code): Remove dead code after `wrong_type_argument'.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 13 Sep 2004 21:13:38 +0000 |
| parents | 0487c26b96ee |
| children | 3eab555cf92b |
| files | src/ChangeLog src/bytecode.c |
| diffstat | 2 files changed, 11 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Sep 13 21:06:31 2004 +0000 +++ b/src/ChangeLog Mon Sep 13 21:13:38 2004 +0000 @@ -1,5 +1,8 @@ 2004-09-13 Stefan Monnier <monnier@iro.umontreal.ca> + * bytecode.c (BYTE_CODE_QUIT): Add missing AFTER_POTENTIAL_GC. + (Fbyte_code): Remove dead code after `wrong_type_argument'. + * alloc.c (Fgarbage_collect): Mark keyboards, gtk data, and specpdl before doing the mark_stack_check_gcpros since they are not on the stack.
--- a/src/bytecode.c Mon Sep 13 21:06:31 2004 +0000 +++ b/src/bytecode.c Mon Sep 13 21:13:38 2004 +0000 @@ -1,5 +1,5 @@ /* Execution of byte code produced by bytecomp.el. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003 + Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -387,6 +387,7 @@ Vquit_flag = Qnil; \ BEFORE_POTENTIAL_GC (); \ Fsignal (Qquit, Qnil); \ + AFTER_POTENTIAL_GC (); \ } \ } while (0) @@ -539,9 +540,7 @@ TOP = Qnil; else { - BEFORE_POTENTIAL_GC (); - Fcar (wrong_type_argument (Qlistp, v1)); - AFTER_POTENTIAL_GC (); + wrong_type_argument (Qlistp, v1); } break; } @@ -574,9 +573,7 @@ TOP = Qnil; else { - BEFORE_POTENTIAL_GC (); - Fcdr (wrong_type_argument (Qlistp, v1)); - AFTER_POTENTIAL_GC (); + wrong_type_argument (Qlistp, v1); } break; } @@ -907,11 +904,7 @@ else if (!NILP (v1)) { immediate_quit = 0; - BEFORE_POTENTIAL_GC (); - v1 = wrong_type_argument (Qlistp, v1); - AFTER_POTENTIAL_GC (); - immediate_quit = 1; - op++; + wrong_type_argument (Qlistp, v1); } } immediate_quit = 0; @@ -920,11 +913,7 @@ else if (NILP (v1)) TOP = Qnil; else - { - BEFORE_POTENTIAL_GC (); - Fcar (wrong_type_argument (Qlistp, v1)); - AFTER_POTENTIAL_GC (); - } + wrong_type_argument (Qlistp, v1); break; } @@ -1554,11 +1543,7 @@ else if (!NILP (v1)) { immediate_quit = 0; - BEFORE_POTENTIAL_GC (); - v1 = wrong_type_argument (Qlistp, v1); - AFTER_POTENTIAL_GC (); - immediate_quit = 1; - op++; + wrong_type_argument (Qlistp, v1); } } immediate_quit = 0; @@ -1567,11 +1552,7 @@ else if (NILP (v1)) TOP = Qnil; else - { - BEFORE_POTENTIAL_GC (); - Fcar (wrong_type_argument (Qlistp, v1)); - AFTER_POTENTIAL_GC (); - } + wrong_type_argument (Qlistp, v1); } else {