From 7ee4c575adfaa0036d97c1cc5fa53a6c23f68f5e Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Thu, 6 Jun 2019 06:49:30 +0200 Subject: synth-expr: fix a crash in vectorize_array --- src/synth/synth-expr.adb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/synth') diff --git a/src/synth/synth-expr.adb b/src/synth/synth-expr.adb index 147ce8a1b..092e10cdb 100644 --- a/src/synth/synth-expr.adb +++ b/src/synth/synth-expr.adb @@ -227,7 +227,7 @@ package body Synth.Expr is procedure Free_Net_Array is new Ada.Unchecked_Deallocation (Net_Array, Net_Array_Acc); - -- Convert the one-dimension VAL to a net. + -- Convert the one-dimension VAL to a net by concatenating. function Vectorize_Array (Val : Value_Acc) return Value_Acc is Arr : Net_Array_Acc; @@ -237,6 +237,8 @@ package body Synth.Expr is begin -- Dynamically allocate ARR to handle large arrays. Arr := new Net_Array (1 .. Val.Arr.Len); + + -- Gather consecutive constant values. Idx := 1; Len := 0; while Idx <= Val.Arr.Len loop @@ -261,6 +263,7 @@ package body Synth.Expr is end loop; if Off = 0 then E := Get_Net (Val.Arr.V (Idx)); + Idx := Idx + 1; else if W_Zx = 0 then E := Build_Const_UB32 -- cgit v1.2.3