patch 9.1.1332: Vim9: segfault when using super within a lambda

Problem:  Vim9: segfault when using super within a lambda
          (lifepillar)
Solution: inherit the class from the current function
          (Yegappan Lakshmanan)

fixes: #17166
closes: #17185

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 4aa9bb3b36bc826d86dce4a820463cd1d3cbb0f6..e854571e5ffb46d6455f4f614fad858853995bdf 100644 (file)
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -12544,6 +12544,35 @@ def Test_super_keyword()
     assert_equal('A.Foo B.Foo', b.Bar())
   END
   v9.CheckSourceSuccess(lines)
+
+  # Test for using super in a lambda function to invoke a base class method from
+  # the new() method.
+  lines =<< trim END
+    vim9script
+
+    def G(F: func): string
+      return F()
+    enddef
+
+    class Base
+      def F(): string
+        return 'Base.F()'
+      enddef
+    endclass
+
+    class Foo extends Base
+      var s: string = 'x'
+      def new()
+        this.s = G((): string => {
+          return super.F()
+        })
+      enddef
+    endclass
+
+    var f = Foo.new()
+    assert_equal('Base.F()', f.s)
+  END
+  v9.CheckSourceSuccess(lines)
 enddef
 
 " Test for using a list of objects

diff --git a/src/version.c b/src/version.c
index 2209282f817bf61f87382b67042bb78b0760f291..35e71ca71cc8821934bebc87ea15c80782402210 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1332,
 /**/
     1331,
 /**/

diff --git a/src/vim9expr.c b/src/vim9expr.c
index 40c5fcc721d4a8e13aee786b6392992c0bcdbc10..d169ed75ab6ea665b31662bf27fea7d36b4f2501 100644 (file)
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -1647,6 +1647,11 @@ compile_lambda(char_u **arg, cctx_T *cctx)
     ++ufunc->uf_refcount;
     clear_tv(&rettv);
 
+    if (cctx->ctx_ufunc != NULL)
+       // This lambda might be defined in a class method.  Inherit the class
+       // from the current function.
+       ufunc->uf_defclass = cctx->ctx_ufunc->uf_defclass;
+
     // Compile it here to get the return type.  The return type is optional,
     // when it's missing use t_unknown.  This is recognized in
     // compile_return().