patch 8.2.2139: Vim9: unreachable code in assignment
Problem: Vim9: unreachable code in assignment.
Solution: Don't check "new_local" when "has_index" is set. Add test for
wrong type of list index.
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 1075e17..60c8fe9 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -326,6 +326,18 @@
END
CheckDefFailure(lines, 'E1012: Type mismatch; expected number but got dict<unknown>', 3)
+ lines =<< trim END
+ var lines: list<string>
+ lines['a'] = 'asdf'
+ END
+ CheckDefFailure(lines, 'E39:', 2)
+
+ lines =<< trim END
+ var lines: string
+ lines[9] = 'asdf'
+ END
+ CheckDefFailure(lines, 'E1141:', 2)
+
# list of dict
var ld: list<dict<number>>
ld[0] = {}
diff --git a/src/version.c b/src/version.c
index 2d39c1b..f6c51e1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2139,
+/**/
2138,
/**/
2137,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 6cbf784..3fae25e 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -5856,8 +5856,6 @@
int r;
// Compile the "idx" in "var[idx]" or "key" in "var.key".
- if (new_local)
- --cctx->ctx_locals.ga_len;
p = var_start + varlen;
if (*p == '[')
{
@@ -5877,8 +5875,6 @@
r = generate_PUSHS(cctx, key);
}
- if (new_local)
- ++cctx->ctx_locals.ga_len;
if (r == FAIL)
goto theend;