patch 8.2.3168: Vim9: type error for constant of type any

Problem:    Vim9: type error for constant of type any.
Solution:   Do add a runtime type check if a constant has type any.
            (closes #8570)

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 6bbbc3681ea3c12236d499b0968a223e9750a83f..3599d6c5d1bcae2cd7ea12ad8fee4b147dd7ab2b 100644 (file)
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1667,6 +1667,16 @@ def Test_var_type_check()
     s:d = {}
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+    vim9script
+    var d = {a: 1, b: [2]}
+    def Func(b: bool)
+      var l: list<number> = b ? d.b : [3]
+    enddef
+    defcompile
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 let g:dict_number = #{one: 1, two: 2}

diff --git a/src/version.c b/src/version.c
index 6a4943d50f39e7a8fa531cda01b2613ef288bc31..b8c782eef29739f0da7a07e2ec139405f54ccde5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3168,
 /**/
     3167,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 4763e9550b2a64543d6f1d0e8f4e8c2fa71df352..956ce44eb01621916f8516d7b1e4d973a8d9dfaf 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1051,7 +1051,8 @@ need_type(
 
     // If the actual type can be the expected type add a runtime check.
     // If it's a constant a runtime check makes no sense.
-    if (!actual_is_const && use_typecheck(actual, expected))
+    if ((!actual_is_const || actual == &t_any)
+                                           && use_typecheck(actual, expected))
     {
        generate_TYPECHECK(cctx, expected, offset, arg_idx);
        return OK;