From f6227b6be67383fd0e6d8fd6c273509515ac3bc0 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Mon, 12 Jan 2015 19:03:12 +0100
Subject: sem: fix Can_Collapse_Signals regression.

---
 src/vhdl/sem.adb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/vhdl')

diff --git a/src/vhdl/sem.adb b/src/vhdl/sem.adb
index 28cef7895..138056896 100644
--- a/src/vhdl/sem.adb
+++ b/src/vhdl/sem.adb
@@ -337,7 +337,11 @@ package body Sem is
       --  If the formal can have sources and is guarded, but the actual is
       --  not guarded (or has not the same kind of guard), signals cannot
       --  be collapsed.
-      if Get_Signal_Kind (Formal_Base) /= Get_Signal_Kind (Actual_Base) then
+      if (Get_Guarded_Signal_Flag (Formal_Base)
+            /= Get_Guarded_Signal_Flag (Actual_Base))
+        or else (Get_Signal_Kind (Formal_Base)
+                   /= Get_Signal_Kind (Actual_Base))
+      then
          return False;
       end if;
 
-- 
cgit v1.2.3