diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-01-05 20:45:10 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-01-08 12:21:05 +0100 |
| commit | daf2e428fa0efff0ca8fe875d2707b09649b8abb (patch) | |
| tree | 566ad0441425cc59bbf29e2bb4c0816479cb867a | |
| parent | d7ae5f546bd23ca7bc717690ddcf9d365a747e4c (diff) | |
| download | vala-daf2e428fa0efff0ca8fe875d2707b09649b8abb.tar.gz | |
codegen: Clear existing length values when revisiting a slice expression
Fixes https://gitlab.gnome.org/GNOME/vala/issues/1274
| -rw-r--r-- | codegen/valaccodearraymodule.vala | 3 | ||||
| -rw-r--r-- | codegen/valaglibvalue.vala | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/codegen/valaccodearraymodule.vala b/codegen/valaccodearraymodule.vala index 117395d65..0a76c72cb 100644 --- a/codegen/valaccodearraymodule.vala +++ b/codegen/valaccodearraymodule.vala @@ -210,7 +210,8 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule { var splicelen = new CCodeBinaryExpression (CCodeBinaryOperator.MINUS, cstop, cstart); set_cvalue (expr, cstartpointer); - append_array_length (expr, splicelen); + // Make sure no previous length values are preserved + set_array_length (expr, splicelen); } void append_struct_array_free_loop (Struct st) { diff --git a/codegen/valaglibvalue.vala b/codegen/valaglibvalue.vala index ed095cf83..acd8ac9d7 100644 --- a/codegen/valaglibvalue.vala +++ b/codegen/valaglibvalue.vala @@ -142,6 +142,17 @@ namespace Vala { glib_value.append_array_length_cvalue (size); } + public static void set_array_length (Expression expr, CCodeExpression size) { + unowned GLibValue? glib_value = (GLibValue) expr.target_value; + if (glib_value == null) { + expr.target_value = new GLibValue (expr.value_type); + glib_value = (GLibValue) expr.target_value; + } else { + glib_value.array_length_cvalues = null; + } + glib_value.append_array_length_cvalue (size); + } + public static unowned List<CCodeExpression>? get_array_lengths (Expression expr) { unowned GLibValue? glib_value = (GLibValue) expr.target_value; if (glib_value == null) { |