diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2022-07-01 17:14:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-01 17:14:44 +0200 |
| commit | d2689fced77bd09b4c67fd629cd46ac07740c5f8 (patch) | |
| tree | 73d7dc160904ad76ad5f01e064c94f0ad1ff39fa | |
| parent | ed346d06d5e285c99cb5ab85b46579db338abdb2 (diff) | |
| download | ocaml-d2689fced77bd09b4c67fd629cd46ac07740c5f8.tar.gz | |
Refactor the initialization of bytecode threading (#11378)
Refactor the initialization of bytecode threading
Use a function `caml_init_thread_code` instead of exposing global variables
`caml_instr_table` and `caml_instr_base`.
This should silence the GCC 12 "dangling-pointer" warning.
Fixes: #11358
| -rw-r--r-- | Changes | 5 | ||||
| -rw-r--r-- | runtime/caml/fix_code.h | 3 | ||||
| -rw-r--r-- | runtime/fix_code.c | 10 | ||||
| -rw-r--r-- | runtime/interp.c | 7 |
4 files changed, 17 insertions, 8 deletions
@@ -14,6 +14,11 @@ OCaml 4.14 maintenance branch (David Allsopp and Nicolás Ojeda Bär, review by Nicolás Ojeda Bär and Sebastien Hinderer) +- #11358, #11378: Refactor the initialization of bytecode threading. + This avoids a "dangling pointer" warning of GCC 12.1. + (Xavier Leroy, report by Armaël Guéneau, review by Gabriel Scherer) + + OCaml 4.14.0 (28 March 2022) ---------------------------- diff --git a/runtime/caml/fix_code.h b/runtime/caml/fix_code.h index 83c393a17d..2eafaa814b 100644 --- a/runtime/caml/fix_code.h +++ b/runtime/caml/fix_code.h @@ -34,8 +34,7 @@ void caml_set_instruction (code_t pos, opcode_t instr); int caml_is_instruction (opcode_t instr1, opcode_t instr2); #ifdef THREADED_CODE -extern char ** caml_instr_table; -extern char * caml_instr_base; +void caml_init_thread_code(void ** instr_table, void * instr_base); void caml_thread_code (code_t code, asize_t len); #endif diff --git a/runtime/fix_code.c b/runtime/fix_code.c index aa059be5df..5584019867 100644 --- a/runtime/fix_code.c +++ b/runtime/fix_code.c @@ -82,8 +82,14 @@ void caml_fixup_endianness(code_t code, asize_t len) #ifdef THREADED_CODE -char ** caml_instr_table; -char * caml_instr_base; +static char ** caml_instr_table; +static char * caml_instr_base; + +void caml_init_thread_code(void ** instr_table, void * instr_base) +{ + caml_instr_table = (char **) instr_table; + caml_instr_base = (char *) instr_base; +} static int* opcode_nargs = NULL; int* caml_init_opcode_nargs(void) diff --git a/runtime/interp.c b/runtime/interp.c index a59811c87d..e6700994bc 100644 --- a/runtime/interp.c +++ b/runtime/interp.c @@ -50,9 +50,9 @@ sp is a local copy of the global variable Caml_state->extern_sp. */ #ifdef THREADED_CODE # define Instruct(name) lbl_##name # if defined(ARCH_SIXTYFOUR) && !defined(ARCH_CODE32) -# define Jumptbl_base ((char *) &&lbl_ACC0) +# define Jumptbl_base &&lbl_ACC0 # else -# define Jumptbl_base ((char *) 0) +# define Jumptbl_base 0 # define jumptbl_base ((char *) 0) # endif # ifdef DEBUG @@ -249,8 +249,7 @@ value caml_interprete(code_t prog, asize_t prog_size) if (prog == NULL) { /* Interpreter is initializing */ #ifdef THREADED_CODE - caml_instr_table = (char **) jumptable; - caml_instr_base = Jumptbl_base; + caml_init_thread_code(jumptable, Jumptbl_base); #endif return Val_unit; } |