Variant gcc-13-14
Applies to 13.2.0, 14.2.0. Source flavors: linux, darwin_arm64.
+164 −0 2 files
gcc/ada/exp_ch4.adb
+21−0modified
| @@ -770 +770 @@package body Exp_Ch4 is | |||
| 770 | 770 | (Expression (Temp_Decl), N); | |
| 771 | 771 | | |
| 772 | 772 | Set_No_Initialization (Expression (Temp_Decl)); | |
| 773 | Added line. | ||
| 774 | Added line. -- Preserve a named subpool from the original allocator. The | ||
| 775 | Added line. -- synthesized allocator is the one used to build the custom | ||
| 776 | Added line. -- Allocate procedure, so dropping the name here would make a | ||
| 777 | Added line. -- controlled allocation use the pool's default subpool. | ||
| 778 | Added line. | ||
| 779 | Added line. if Present (Subpool_Handle_Name (N)) then | ||
| 780 | Added line. Set_Subpool_Handle_Name | ||
| 781 | Added line. (Expression (Temp_Decl), | ||
| 782 | Added line. New_Copy_Tree (Subpool_Handle_Name (N))); | ||
| 783 | Added line. end if; | ||
| 784 | Added line. | ||
| 773 | 785 | Insert_Action (N, Temp_Decl); | |
| 774 | 786 | | |
| 775 | 787 | Build_Allocate_Deallocate_Proc (Temp_Decl, True); | |
| @@ -843 +855 @@package body Exp_Ch4 is | |||
| 843 | 855 | (Expression (Temp_Decl), Comes_From_Source (N)); | |
| 844 | 856 | | |
| 845 | 857 | Set_No_Initialization (Expression (Temp_Decl)); | |
| 858 | Added line. | ||
| 859 | Added line. -- Preserve a named subpool from the original allocator | ||
| 860 | Added line. | ||
| 861 | Added line. if Present (Subpool_Handle_Name (N)) then | ||
| 862 | Added line. Set_Subpool_Handle_Name | ||
| 863 | Added line. (Expression (Temp_Decl), | ||
| 864 | Added line. New_Copy_Tree (Subpool_Handle_Name (N))); | ||
| 865 | Added line. end if; | ||
| 866 | Added line. | ||
| 846 | 867 | Insert_Action (N, Temp_Decl); | |
| 847 | 868 | | |
| 848 | 869 | Build_Allocate_Deallocate_Proc (Temp_Decl, True); | |
gcc/testsuite/gnat.dg/controlled_subpool_allocator.adb
+143−0new file
| @@ -0 +1 @@ | |||
| 1 | Added line. -- { dg-do run } | ||
| 2 | Added line. -- { dg-options "-gnata" } | ||
| 3 | Added line. | ||
| 4 | Added line. with Ada.Finalization; | ||
| 5 | Added line. with Ada.Text_IO; use Ada.Text_IO; | ||
| 6 | Added line. with Ada.Unchecked_Deallocate_Subpool; | ||
| 7 | Added line. with System; | ||
| 8 | Added line. with System.Storage_Elements; use System.Storage_Elements; | ||
| 9 | Added line. with System.Storage_Pools.Subpools; use System.Storage_Pools.Subpools; | ||
| 10 | Added line. | ||
| 11 | Added line. procedure Controlled_Subpool_Allocator is | ||
| 12 | Added line. Finalizations : Natural := 0; | ||
| 13 | Added line. | ||
| 14 | Added line. type Test_Subpool is new Root_Subpool with null record; | ||
| 15 | Added line. type Test_Interface is limited interface; | ||
| 16 | Added line. | ||
| 17 | Added line. type Test_Pool is new Root_Storage_Pool_With_Subpools with record | ||
| 18 | Added line. Region : aliased Test_Subpool; | ||
| 19 | Added line. Storage : aliased Storage_Array (1 .. 4_096); | ||
| 20 | Added line. Next : Storage_Offset := 1; | ||
| 21 | Added line. Allocations : Natural := 0; | ||
| 22 | Added line. Releases : Natural := 0; | ||
| 23 | Added line. end record; | ||
| 24 | Added line. | ||
| 25 | Added line. overriding | ||
| 26 | Added line. function Create_Subpool | ||
| 27 | Added line. (Pool : in out Test_Pool) return not null Subpool_Handle; | ||
| 28 | Added line. | ||
| 29 | Added line. overriding | ||
| 30 | Added line. procedure Allocate_From_Subpool | ||
| 31 | Added line. (Pool : in out Test_Pool; | ||
| 32 | Added line. Storage_Address : out System.Address; | ||
| 33 | Added line. Size_In_Storage_Elements : Storage_Count; | ||
| 34 | Added line. Alignment : Storage_Count; | ||
| 35 | Added line. Subpool : not null Subpool_Handle); | ||
| 36 | Added line. | ||
| 37 | Added line. overriding | ||
| 38 | Added line. procedure Deallocate_Subpool | ||
| 39 | Added line. (Pool : in out Test_Pool; Subpool : in out Subpool_Handle); | ||
| 40 | Added line. | ||
| 41 | Added line. type Tracked is new Ada.Finalization.Limited_Controlled | ||
| 42 | Added line. and Test_Interface with record | ||
| 43 | Added line. Value : Natural := 0; | ||
| 44 | Added line. end record; | ||
| 45 | Added line. | ||
| 46 | Added line. overriding procedure Finalize (Object : in out Tracked); | ||
| 47 | Added line. | ||
| 48 | Added line. overriding | ||
| 49 | Added line. function Create_Subpool | ||
| 50 | Added line. (Pool : in out Test_Pool) return not null Subpool_Handle | ||
| 51 | Added line. is | ||
| 52 | Added line. Result : constant not null Subpool_Handle := | ||
| 53 | Added line. Pool.Region'Unchecked_Access; | ||
| 54 | Added line. begin | ||
| 55 | Added line. Set_Pool_Of_Subpool (Result, Pool); | ||
| 56 | Added line. return Result; | ||
| 57 | Added line. end Create_Subpool; | ||
| 58 | Added line. | ||
| 59 | Added line. overriding | ||
| 60 | Added line. procedure Allocate_From_Subpool | ||
| 61 | Added line. (Pool : in out Test_Pool; | ||
| 62 | Added line. Storage_Address : out System.Address; | ||
| 63 | Added line. Size_In_Storage_Elements : Storage_Count; | ||
| 64 | Added line. Alignment : Storage_Count; | ||
| 65 | Added line. Subpool : not null Subpool_Handle) | ||
| 66 | Added line. is | ||
| 67 | Added line. Current : System.Address := Pool.Storage (Pool.Next)'Address; | ||
| 68 | Added line. begin | ||
| 69 | Added line. if Subpool /= Pool.Region'Unchecked_Access then | ||
| 70 | Added line. raise Program_Error with "allocation used an unexpected subpool"; | ||
| 71 | Added line. end if; | ||
| 72 | Added line. | ||
| 73 | Added line. while Current mod Alignment /= 0 loop | ||
| 74 | Added line. Pool.Next := Pool.Next + 1; | ||
| 75 | Added line. Current := Pool.Storage (Pool.Next)'Address; | ||
| 76 | Added line. end loop; | ||
| 77 | Added line. | ||
| 78 | Added line. Storage_Address := Current; | ||
| 79 | Added line. Pool.Next := Pool.Next + Storage_Offset (Size_In_Storage_Elements); | ||
| 80 | Added line. Pool.Allocations := Pool.Allocations + 1; | ||
| 81 | Added line. end Allocate_From_Subpool; | ||
| 82 | Added line. | ||
| 83 | Added line. overriding | ||
| 84 | Added line. procedure Deallocate_Subpool | ||
| 85 | Added line. (Pool : in out Test_Pool; Subpool : in out Subpool_Handle) | ||
| 86 | Added line. is | ||
| 87 | Added line. begin | ||
| 88 | Added line. Pool.Releases := Pool.Releases + 1; | ||
| 89 | Added line. Subpool := null; | ||
| 90 | Added line. end Deallocate_Subpool; | ||
| 91 | Added line. | ||
| 92 | Added line. overriding procedure Finalize (Object : in out Tracked) is | ||
| 93 | Added line. begin | ||
| 94 | Added line. if Object.Value /= 7 then | ||
| 95 | Added line. raise Program_Error with "controlled object value was not preserved"; | ||
| 96 | Added line. end if; | ||
| 97 | Added line. Finalizations := Finalizations + 1; | ||
| 98 | Added line. end Finalize; | ||
| 99 | Added line. | ||
| 100 | Added line. Pool : Test_Pool; | ||
| 101 | Added line. Region : Subpool_Handle := Create_Subpool (Pool); | ||
| 102 | Added line. Selections : Natural := 0; | ||
| 103 | Added line. | ||
| 104 | Added line. function Select_Region return not null Subpool_Handle is | ||
| 105 | Added line. begin | ||
| 106 | Added line. Selections := Selections + 1; | ||
| 107 | Added line. return Region; | ||
| 108 | Added line. end Select_Region; | ||
| 109 | Added line. | ||
| 110 | Added line. type Plain_Access is access Integer with Storage_Pool => Pool; | ||
| 111 | Added line. type Tracked_Access is access Tracked with Storage_Pool => Pool; | ||
| 112 | Added line. type Interface_Access is access Test_Interface'Class | ||
| 113 | Added line. with Storage_Pool => Pool; | ||
| 114 | Added line. | ||
| 115 | Added line. Plain_Object : Plain_Access := new (Region) Integer'(3); | ||
| 116 | Added line. Tracked_Object : Tracked_Access := | ||
| 117 | Added line. new (Select_Region) Tracked' | ||
| 118 | Added line. (Ada.Finalization.Limited_Controlled with Value => 7); | ||
| 119 | Added line. Interface_Object : Interface_Access := | ||
| 120 | Added line. new (Select_Region) Tracked' | ||
| 121 | Added line. (Ada.Finalization.Limited_Controlled with Value => 7); | ||
| 122 | Added line. | ||
| 123 | Added line. begin | ||
| 124 | Added line. if Plain_Object.all /= 3 or else Tracked_Object.Value /= 7 then | ||
| 125 | Added line. raise Program_Error with "allocated values were not preserved"; | ||
| 126 | Added line. end if; | ||
| 127 | Added line. if Interface_Object = null or else Pool.Allocations /= 3 then | ||
| 128 | Added line. raise Program_Error with "named subpool did not receive all allocations"; | ||
| 129 | Added line. end if; | ||
| 130 | Added line. if Selections /= 2 then | ||
| 131 | Added line. raise Program_Error with "subpool expressions were not evaluated once"; | ||
| 132 | Added line. end if; | ||
| 133 | Added line. | ||
| 134 | Added line. Ada.Unchecked_Deallocate_Subpool (Region); | ||
| 135 | Added line. if Region /= null or else Pool.Releases /= 1 or else Finalizations /= 2 then | ||
| 136 | Added line. raise Program_Error with "subpool release did not finalize both objects"; | ||
| 137 | Added line. end if; | ||
| 138 | Added line. | ||
| 139 | Added line. Plain_Object := null; | ||
| 140 | Added line. Tracked_Object := null; | ||
| 141 | Added line. Interface_Object := null; | ||
| 142 | Added line. Put_Line ("PASS controlled named subpool allocator"); | ||
| 143 | Added line. end Controlled_Subpool_Allocator; | ||
| 144 | | ||