Mercurial > vim
changeset 33101:8cbdd2cbf10a v9.0.1835
patch 9.0.1835: Perl interface has problems with load PL_current_context
Commit: https://github.com/vim/vim/commit/7a9d1aa878d8724e28893b968016b86a3a70c63f
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Fri Sep 1 18:46:17 2023 +0200
patch 9.0.1835: Perl interface has problems with load PL_current_context
Problem: Perl interface has problems with load PL_current_context
Solution: Fix Perl interface to load PL_current_context from library
In #12914, in order to fix an issue with Perl 5.36 dynamic builds, (that
version introduced a thread-local `PL_current_context`), the file added
the variable manually so we can satisfy the linker. However, the
variable is a different one from the one in the library, so there could
be unpredictable behavior. Instead, just use `dlsym` to load the context
from the library. The fact that it's thread-local doesn't matter too
much to us because Vim's interface is single-threaded so it will work
properly.
closes: #12996
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 01 Sep 2023 19:00:04 +0200 |
| parents | d6ca39752b4f |
| children | e8d7f4f40a26 |
| files | src/if_perl.xs src/version.c |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -315,6 +315,9 @@ typedef int perl_key; # define PL_thr_key *dll_PL_thr_key # endif # endif +# ifdef PERL_USE_THREAD_LOCAL +# define PL_current_context *dll_PL_current_context +# endif # define Perl_hv_iternext_flags dll_Perl_hv_iternext_flags # define Perl_hv_iterinit dll_Perl_hv_iterinit # define Perl_hv_iterkey dll_Perl_hv_iterkey @@ -484,6 +487,9 @@ static GV** (*Perl_Ierrgv_ptr)(register static SV* (*Perl_Isv_yes_ptr)(register PerlInterpreter*); static perl_key* (*Perl_Gthr_key_ptr)_((pTHX)); # endif +# ifdef PERL_USE_THREAD_LOCAL +static void** dll_PL_current_context; +# endif static void (*boot_DynaLoader)_((pTHX_ CV*)); static HE * (*Perl_hv_iternext_flags)(pTHX_ HV *, I32); static I32 (*Perl_hv_iterinit)(pTHX_ HV *); @@ -633,6 +639,9 @@ static struct { # ifdef USE_ITHREADS {"PL_thr_key", (PERL_PROC*)&dll_PL_thr_key}, # endif +# ifdef PERL_USE_THREAD_LOCAL + {"PL_current_context", (PERL_PROC*)&dll_PL_current_context}, +# endif # else {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, @@ -1516,10 +1525,6 @@ IV Perl_sv_2iv_flags(pTHX_ SV* sv, I32 f } # endif -# ifdef PERL_USE_THREAD_LOCAL -PERL_THREAD_LOCAL void *PL_current_context; -# endif - #endif // DYNAMIC_PERL XS(boot_VIM);