diff options
| -rw-r--r-- | src/vhdl/vhdl-canon.adb | 6 | ||||
| -rw-r--r-- | src/vhdl/vhdl-utils.adb | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/vhdl/vhdl-canon.adb b/src/vhdl/vhdl-canon.adb index 65ac4eb39..4db4b719e 100644 --- a/src/vhdl/vhdl-canon.adb +++ b/src/vhdl/vhdl-canon.adb @@ -3001,7 +3001,8 @@ package body Vhdl.Canon is when Iir_Kind_Component_Configuration => Canon_Component_Specification (El, Blk); when Iir_Kind_Block_Configuration => - Sub_Blk := Strip_Denoting_Name (Get_Block_Specification (El)); + Sub_Blk := Get_Block_From_Block_Specification + (Get_Block_Specification (El)); case Get_Kind (Sub_Blk) is when Iir_Kind_Block_Statement => Set_Block_Block_Configuration (Sub_Blk, El); @@ -3309,8 +3310,7 @@ package body Vhdl.Canon is -- Create a default configuration declaration for architecture ARCH. function Create_Default_Configuration_Declaration - (Arch : Iir_Architecture_Body) - return Iir_Design_Unit + (Arch : Iir_Architecture_Body) return Iir_Design_Unit is Loc : constant Location_Type := Get_Location (Arch); Config : Iir_Configuration_Declaration; diff --git a/src/vhdl/vhdl-utils.adb b/src/vhdl/vhdl-utils.adb index 3d6115662..dffc7c903 100644 --- a/src/vhdl/vhdl-utils.adb +++ b/src/vhdl/vhdl-utils.adb @@ -1305,17 +1305,14 @@ package body Vhdl.Utils is end Is_Operation_For_Type; -- From a block_specification, returns the block. - function Get_Block_From_Block_Specification (Block_Spec : Iir) - return Iir + function Get_Block_From_Block_Specification (Block_Spec : Iir) return Iir is Res : Iir; begin case Get_Kind (Block_Spec) is when Iir_Kind_Design_Unit => Res := Get_Library_Unit (Block_Spec); - if Get_Kind (Res) /= Iir_Kind_Architecture_Body then - raise Internal_Error; - end if; + pragma Assert (Get_Kind (Res) = Iir_Kind_Architecture_Body); return Res; when Iir_Kind_Block_Statement | Iir_Kind_Architecture_Body |