From 60d1b18734fff144f1608da6228d60e4bda7b24c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 26 Aug 2015 19:24:28 -0700 Subject: Assume GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS This removes the need for GCPRO1 etc. Suggested by Stefan Monnier in: http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00918.html * doc/lispref/internals.texi (Writing Emacs Primitives): * etc/NEWS: Document the change. * src/alloc.c (gcprolist, dump_zombies, MAX_ZOMBIES, zombies) (nzombies, ngcs, avg_zombies, max_live, max_zombies, avg_live) (Fgc_status, check_gcpros, relocatable_string_data_p, gc-precise): * src/bytecode.c (mark_byte_stack) [BYTE_MARK_STACK]: * src/eval.c (gcpro_level) [DEBUG_GCPRO]: * src/lisp.h (struct handler.gcpro, struct gcpro, GC_MARK_STACK) (GC_USE_GCPROS_AS_BEFORE, GC_MAKE_GCPROS_NOOPS) (GC_MARK_STACK_CHECK_GCPROS, GC_USE_GCPROS_CHECK_ZOMBIES) (BYTE_MARK_STACK, GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6) (GCPRO7, UNGCPRO, RETURN_UNGCPRO): Remove. All uses removed. The code now assumes GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS. * src/bytecode.c (relocate_byte_stack): Rename from unmark_byte_stack, since it now only relocates. All callers changed. * src/frame.c (make_frame): Add an IF_LINT to pacify GCC 5.2 with GCPROs removed. * src/systime.h: Use EMACS_LISP_H as the canary instead of GCPRO1. * test/automated/finalizer-tests.el (finalizer-basic) (finalizer-circular-reference, finalizer-cross-reference) (finalizer-error): * test/automated/generator-tests.el (cps-test-iter-close-finalizer): Remove tests, as they depend on gc-precise. --- src/bidi.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/bidi.c') diff --git a/src/bidi.c b/src/bidi.c index bcc15b8c8f5..9427b81298f 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -3348,7 +3348,6 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it) { int old_level, new_level, next_level; struct bidi_it sentinel; - struct gcpro gcpro1; if (bidi_it->charpos < 0 || bidi_it->bytepos < 0) emacs_abort (); @@ -3358,11 +3357,6 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it) bidi_it->scan_dir = 1; /* default to logical order */ } - /* The code below can call eval, and thus cause GC. If we are - iterating a Lisp string, make sure it won't be GCed. */ - if (STRINGP (bidi_it->string.lstring)) - GCPRO1 (bidi_it->string.lstring); - /* If we just passed a newline, initialize for the next line. */ if (!bidi_it->first_elt && (bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB)) @@ -3508,9 +3502,6 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it) eassert (bidi_it->resolved_level >= 0 && bidi_it->resolved_level <= BIDI_MAXDEPTH + 2); - - if (STRINGP (bidi_it->string.lstring)) - UNGCPRO; } /* Utility function for looking for strong directional characters -- cgit v1.2.1