aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2017-01-18 05:28:07 +0100
committerTristan Gingold <tgingold@free.fr>2017-01-18 05:28:07 +0100
commitc92e5035e8b469d43040e345b0158c0705a5f562 (patch)
tree552e03c11300be4145089b4e48e7cd6c36d0032c
parent78a9ae626f5d01473043e37a580712df9a183b66 (diff)
downloadghdl-c92e5035e8b469d43040e345b0158c0705a5f562.tar.gz
ghdl-c92e5035e8b469d43040e345b0158c0705a5f562.tar.bz2
ghdl-c92e5035e8b469d43040e345b0158c0705a5f562.zip
canon: fix thinko for sequential conditional signal assignment.
Fix #259
-rw-r--r--src/vhdl/canon.adb6
1 files changed, 2 insertions, 4 deletions
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