Skip to content

GitLab

Commit 892a8eb5 authored by Stefan Monnier's avatar Stefan Monnier
Browse files
Options

(BYTE_CODE_QUIT): Add missing AFTER_POTENTIAL_GC. 

(Fbyte_code): Remove dead code after `wrong_type_argument'.
parent 126f9c02
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 27 deletions
src/ChangeLog
View file @ 892a8eb5
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.
......
src/bytecode.c
View file @ 892a8eb5
/* 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 @@ unmark_byte_stack ()
Vquit_flag = Qnil; \
BEFORE_POTENTIAL_GC (); \
Fsignal (Qquit, Qnil); \
AFTER_POTENTIAL_GC (); \
} \
} while (0)
......@@ -539,9 +540,7 @@ If the third argument is incorrect, Emacs may crash. */)
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 @@ If the third argument is incorrect, Emacs may crash. */)
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 @@ If the third argument is incorrect, Emacs may crash. */)
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 @@ If the third argument is incorrect, Emacs may crash. */)
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 @@ If the third argument is incorrect, Emacs may crash. */)
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 @@ If the third argument is incorrect, Emacs may crash. */)
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
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment