diff options
| author | Alan Mackenzie | 2021-12-31 23:17:28 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2021-12-31 23:17:28 +0000 |
| commit | 4e77177b063f9da8a48709aa3ef416d0ac21837b (patch) | |
| tree | a41117055f846a4fee2dee9aa498036b977b38df /src/comp.c | |
| parent | ff9af1f1f69264bcbb7b926363293e55a6b3f330 (diff) | |
| download | emacs-4e77177b063f9da8a48709aa3ef416d0ac21837b.tar.gz emacs-4e77177b063f9da8a48709aa3ef416d0ac21837b.zip | |
Try to make scratch/correct-warning-pos build on Windows and not segfault
* src/comp.c (emit_EQ): Replace calls to gcc_jit_context_new_location with
NULLs.
(Fcomp__init_ctxt): Remove the register_emitter call for Qsymbol_with_pos_p,
which was causing a segfault.
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/comp.c b/src/comp.c index 834656897e4..73555c0d2c1 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -1490,13 +1490,13 @@ emit_EQ (gcc_jit_rvalue *x, gcc_jit_rvalue *y) | |||
| 1490 | return | 1490 | return |
| 1491 | emit_OR ( | 1491 | emit_OR ( |
| 1492 | gcc_jit_context_new_comparison ( | 1492 | gcc_jit_context_new_comparison ( |
| 1493 | comp.ctxt, gcc_jit_context_new_location (comp.ctxt, "comp.c", __LINE__, 0), | 1493 | comp.ctxt, NULL, |
| 1494 | GCC_JIT_COMPARISON_EQ, | 1494 | GCC_JIT_COMPARISON_EQ, |
| 1495 | emit_XLI (x), emit_XLI (y)), | 1495 | emit_XLI (x), emit_XLI (y)), |
| 1496 | emit_AND ( | 1496 | emit_AND ( |
| 1497 | gcc_jit_lvalue_as_rvalue ( | 1497 | gcc_jit_lvalue_as_rvalue ( |
| 1498 | gcc_jit_rvalue_dereference (comp.f_symbols_with_pos_enabled_ref, | 1498 | gcc_jit_rvalue_dereference (comp.f_symbols_with_pos_enabled_ref, |
| 1499 | gcc_jit_context_new_location (comp.ctxt, "comp.c", __LINE__, 0))), | 1499 | NULL)), |
| 1500 | emit_OR ( | 1500 | emit_OR ( |
| 1501 | emit_AND ( | 1501 | emit_AND ( |
| 1502 | emit_SYMBOL_WITH_POS_P (x), | 1502 | emit_SYMBOL_WITH_POS_P (x), |
| @@ -4561,7 +4561,6 @@ Return t on success. */) | |||
| 4561 | register_emitter (Qnumberp, emit_numperp); | 4561 | register_emitter (Qnumberp, emit_numperp); |
| 4562 | register_emitter (Qintegerp, emit_integerp); | 4562 | register_emitter (Qintegerp, emit_integerp); |
| 4563 | register_emitter (Qcomp_maybe_gc_or_quit, emit_maybe_gc_or_quit); | 4563 | register_emitter (Qcomp_maybe_gc_or_quit, emit_maybe_gc_or_quit); |
| 4564 | register_emitter (Qsymbol_with_pos_p, emit_SYMBOL_WITH_POS_P); | ||
| 4565 | } | 4564 | } |
| 4566 | 4565 | ||
| 4567 | comp.ctxt = gcc_jit_context_acquire (); | 4566 | comp.ctxt = gcc_jit_context_acquire (); |