# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1594142145 14400
# Node ID 3e60f505f03819256e3258504a7e1046b3ea60bf
# Parent  a32409899ad6c2bf69895b23cda8b7bebc1a8af3# Parent  c09bc9e108b54ef144a7aa9511338c72fd563058
maint: merge stable to default.

diff -r a32409899ad6 -r 3e60f505f038 libinterp/corefcn/stack-frame.cc
--- a/libinterp/corefcn/stack-frame.cc	Sun Jul 05 12:04:37 2020 +0200
+++ b/libinterp/corefcn/stack-frame.cc	Tue Jul 07 13:15:45 2020 -0400
@@ -1510,7 +1510,7 @@
                     size_t script_sr_data_offset = script_sr.data_offset ();
 
                     m_lexical_frame_offsets.at (script_sr_data_offset)
-                      = parent_scope_sr.frame_offset () + 1;
+                      = parent_scope_sr.frame_offset () + count;
 
                     m_value_offsets.at (script_sr_data_offset)
                       = parent_scope_sr.data_offset ();
@@ -1703,7 +1703,7 @@
                 found = true;
                 symbol_record parent_scope_sr = p->second;
 
-                frame_offset = parent_scope_sr.frame_offset () + 1;
+                frame_offset = parent_scope_sr.frame_offset () + count;
 
                 data_offset = parent_scope_sr.data_offset ();