diff options
| author | Andrea Corallo <akrl@sdf.org> | 2019-11-17 12:46:21 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-01-01 11:38:06 +0100 |
| commit | ab3f36fac2da2979713109561f086d95bb26d580 (patch) | |
| tree | f49ff21617d4369fc06e3a7222b56d70b6670746 /src/comp.c | |
| parent | 437c75cfcda4a0e9fd387d22aa8c0177c835c66b (diff) | |
| download | emacs-ab3f36fac2da2979713109561f086d95bb26d580.tar.gz emacs-ab3f36fac2da2979713109561f086d95bb26d580.tar.bz2 emacs-ab3f36fac2da2979713109561f086d95bb26d580.zip | |
style nit into load_comp_unit
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/comp.c b/src/comp.c index 2638290859f..e5d703f769f 100644 --- a/src/comp.c +++ b/src/comp.c @@ -3217,20 +3217,18 @@ load_comp_unit (dynlib_handle_ptr handle, char *file_name) Lisp_Object subr = Fsymbol_function (f_sym); if (!NILP (subr)) { - if (!SUBRP (subr)) - { + if (!SUBRP (subr) /* If is not a subr try to recover the original one assuming was advised. */ - if (!(!NILP (CALL1I (ad-has-any-advice, f_sym)) - && SUBRP (subr = CALL1I (ad-get-orig-definition, f_sym)))) - { - /* FIXME: This is not robust in case of primitive - redefinition. */ - err_msg = format_string ("primitive %s redefined " - "or wrong relocation?", - f_str); - goto exit_error; - } + && !(!NILP (CALL1I (ad-has-any-advice, f_sym)) + && SUBRP (subr = CALL1I (ad-get-orig-definition, f_sym)))) + { + /* FIXME: This is not robust in case of primitive + redefinition. */ + err_msg = format_string ("primitive %s redefined " + "or wrong relocation?", + f_str); + goto exit_error; } f_relocs[i] = XSUBR (subr)->function.a0; } |