From 7b3afe306288b6486ae76452af7ddb34f81ffcd2 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 20 Nov 2019 07:49:46 +0100 Subject: synth: fix regression due to synth_bit_eq_const change. --- src/synth/synth-oper.adb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/synth') diff --git a/src/synth/synth-oper.adb b/src/synth/synth-oper.adb index 45eddb435..255df2e3f 100644 --- a/src/synth/synth-oper.adb +++ b/src/synth/synth-oper.adb @@ -107,8 +107,13 @@ package body Synth.Oper is Set_Location (N, Loc); return Create_Value_Net (N, Boolean_Type); elsif Val = 1 then - -- The result type is a boolean. - return Create_Value_Discrete (1, Boolean_Type); + -- The result type is a boolean; convert if needed. + if Expr.Typ.Kind = Type_Logic then + return Create_Value_Net (Get_Net (Expr), Boolean_Type); + else + pragma Assert (Expr.Typ.Kind = Type_Bit); + return Expr; + end if; else pragma Assert (Val = 0); N := Build_Monadic (Build_Context, Id_Not, Get_Net (Expr)); -- cgit v1.2.3