From c92e5035e8b469d43040e345b0158c0705a5f562 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 18 Jan 2017 05:28:07 +0100 Subject: canon: fix thinko for sequential conditional signal assignment. Fix #259 --- src/vhdl/canon.adb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/vhdl') diff --git a/src/vhdl/canon.adb b/src/vhdl/canon.adb index 595faaeb7..05ffff59b 100644 --- a/src/vhdl/canon.adb +++ b/src/vhdl/canon.adb @@ -1453,12 +1453,10 @@ package body Canon is Target := Build_Reference_Decl (Target, Orig_Stmt); end if; Set_Target (Stmt, Target); - if Proc = Null_Iir then - Sensitivity_List := Null_Iir_List; - else + if Proc /= Null_Iir then Sensitivity_List := Get_Sensitivity_List (Proc); + Extract_Waveform_Sensitivity (Waveform_Chain, Sensitivity_List); end if; - Extract_Waveform_Sensitivity (Waveform_Chain, Sensitivity_List); Set_Waveform_Chain (Stmt, Waveform_Chain); Set_Delay_Mechanism (Stmt, Get_Delay_Mechanism (Orig_Stmt)); Set_Reject_Time_Expression -- cgit v1.2.3