maint: Merge stable to default.

Author: mmuetzel

libinterp/octave-value/cdef-object.cc

@@ -541,6 +541,13 @@ cdef_object_array::fill_empty_values (Array<cdef_object>& arr)
     }
 }
 
+void
+cdef_object_array::break_closure_cycles (const std::shared_ptr<stack_frame>& frame)
+{
+  for (octave_idx_type i = 0; i < m_array.numel (); i++)
+    m_array(i).break_closure_cycles (frame);
+}
+
 void
 cdef_object_scalar::break_closure_cycles (const std::shared_ptr<stack_frame>& frame)
 {

libinterp/octave-value/cdef-object.h

@@ -414,6 +414,9 @@ class OCTINTERP_API cdef_object_array : public cdef_object_base
 
   dim_vector dims () const { return m_array.dims (); }
 
+  OCTINTERP_API void
+  break_closure_cycles (const std::shared_ptr<stack_frame>& frame);
+
   bool is_valid () const { return true; }
 
   bool is_array () const { return true; }

test/classdef/cdef_array_break_cycles.m

@@ -0,0 +1,10 @@
+function fcn = cdef_array_break_cycles ()
+  obj_array(1) = foo_value_class ();
+  obj_array(2) = foo_value_class ();
+
+  function result = nested_func (x)
+    result = obj_array;
+  endfunction
+
+  fcn = @nested_func;
+endfunction

test/classdef/classdef.tst

@@ -219,6 +219,13 @@
 %!error <duplicate method>   A = class_bug66930A ([1 2 3], 3);
 %!error <duplicate property> B = class_bug66930B ([1 2 3], 3);
 
+## break closure cycles for classdef arrays
+%!test <*67749>
+%! fcn = cdef_array_break_cycles ();
+%! result = fcn ([]);
+%! assert (numel (result), 2);
+%! assert (class (result), "foo_value_class");
+
 ## duplicate definitions of methods in parent classes (bug #50011)
 %!error <method .* conflicting>
 %! cls_50011 = class_bug50011_1 ();

test/classdef/module.mk

@@ -4,6 +4,7 @@ classdef_TEST_FILES = \
   %reldir%/@class_bug67362/class_bug67362.m \
   %reldir%/@class_bug67362/shared_name.m \
   %reldir%/bug_60763.m \
+  %reldir%/cdef_array_break_cycles.m \
   %reldir%/class_bug50011_1.m \
   %reldir%/class_bug50011_1A.m \
   %reldir%/class_bug50011_1B.m \