diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-21 22:53:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-21 22:53:38 +0100 |
| commit | 9b6344613eecfcf77c510d7b63fcc4b7b51aefbc (patch) | |
| tree | de908c507c80ae09e879f347913cb50b6116fb27 | |
| parent | 57d5a01cb45d6edb16c3835a49b42d6d8fc0163e (diff) | |
patch 8.2.2389: test failure on a few systemsv8.2.2389
Problem: Test failure on a few systems.
Solution: Avoid that "char" value is negative.
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9.h | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 4 | ||||
| -rw-r--r-- | src/vim9execute.c | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/version.c b/src/version.c index 6d99990cd3..568756b85f 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2389, +/**/ 2388, /**/ 2387, diff --git a/src/vim9.h b/src/vim9.h index c51be8ef62..e6c4087c61 100644 --- a/src/vim9.h +++ b/src/vim9.h @@ -224,7 +224,7 @@ typedef struct { // arguments to ISN_CHECKTYPE typedef struct { type_T *ct_type; - char ct_off; // offset in stack, -1 is bottom + char ct_off; // offset in stack (positive), 1 is bottom char ct_arg_idx; // argument index or zero } checktype_T; diff --git a/src/vim9compile.c b/src/vim9compile.c index ead971feba..2fad4ac34b 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -826,7 +826,9 @@ generate_TYPECHECK( if ((isn = generate_instr(cctx, ISN_CHECKTYPE)) == NULL) return FAIL; isn->isn_arg.type.ct_type = alloc_type(expected); - isn->isn_arg.type.ct_off = offset; + // Use the negated offset so that it's always positive. Some systems don't + // support negative numbers for "char". + isn->isn_arg.type.ct_off = (char)-offset; isn->isn_arg.type.ct_arg_idx = argidx; // type becomes expected diff --git a/src/vim9execute.c b/src/vim9execute.c index 7d1d079bb1..b5f4be34e3 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -3240,7 +3240,7 @@ call_def_function( { checktype_T *ct = &iptr->isn_arg.type; - tv = STACK_TV_BOT(ct->ct_off); + tv = STACK_TV_BOT(-(int)ct->ct_off); SOURCING_LNUM = iptr->isn_lnum; if (check_typval_type(ct->ct_type, tv, ct->ct_arg_idx) == FAIL) @@ -4242,11 +4242,11 @@ ex_disassemble(exarg_T *eap) if (ct->ct_arg_idx == 0) smsg("%4d CHECKTYPE %s stack[%d]", current, type_name(ct->ct_type, &tofree), - (int)ct->ct_off); + -(int)ct->ct_off); else smsg("%4d CHECKTYPE %s stack[%d] arg %d", current, type_name(ct->ct_type, &tofree), - (int)ct->ct_off, + -(int)ct->ct_off, (int)ct->ct_arg_idx); vim_free(tofree); break; |