| ... | ... | @@ -25,24 +25,24 @@ base: link.File, |
| 25 | 25 | mf: MappedFile, |
| 26 | 26 | nodes: std.MultiArrayList(Node), |
| 27 | 27 | members: std.ArrayList(Member), |
| 28 | | pending_members: std.AutoArrayHashMapUnmanaged(Member.Index, void), |
| 28 | pending_members: std.array_hash_map.Auto(Member.Index, void), |
| 29 | 29 | lib_string_table: std.ArrayList(String), |
| 30 | 30 | lib_string_len: u32, |
| 31 | 31 | long_names_table: LongNamesTable, |
| 32 | 32 | import_table: ImportTable, |
| 33 | 33 | export_table: ExportTable, |
| 34 | 34 | symbol_table: SymbolTable, |
| 35 | | inputs: std.ArrayHashMapUnmanaged(std.Build.Cache.Path, void, std.Build.Cache.Path.TableAdapter, false), |
| 35 | inputs: std.array_hash_map.Custom(std.Build.Cache.Path, void, std.Build.Cache.Path.TableAdapter, false), |
| 36 | 36 | input_archives: std.ArrayList(InputArchive), |
| 37 | 37 | input_archive_members: std.ArrayList(InputArchive.Member), |
| 38 | 38 | input_archive_symbols: std.ArrayList(InputArchive.Member.Symbol), |
| 39 | | input_archive_symbol_indices: std.AutoArrayHashMapUnmanaged(String, InputArchive.SearchList), |
| 39 | input_archive_symbol_indices: std.array_hash_map.Auto(String, InputArchive.SearchList), |
| 40 | 40 | pending_input: ?InputArchive.Member.Index, |
| 41 | 41 | pending_default_libs: std.ArrayList(struct { |
| 42 | 42 | path: []const u8, |
| 43 | 43 | ioi: InputObject.Index, |
| 44 | 44 | }), |
| 45 | | alternate_names: std.AutoArrayHashMapUnmanaged(String, String), |
| 45 | alternate_names: std.array_hash_map.Auto(String, String), |
| 46 | 46 | input_objects: std.ArrayList(InputObject), |
| 47 | 47 | input_symbols: std.ArrayList(struct { si: Symbol.Index, name: String }), |
| 48 | 48 | input_sections: std.ArrayList(Node.InputSection), |
| ... | ... | @@ -57,10 +57,10 @@ strings: std.HashMapUnmanaged( |
| 57 | 57 | std.hash_map.default_max_load_percentage, |
| 58 | 58 | ), |
| 59 | 59 | string_bytes: std.ArrayList(u8), |
| 60 | | section_table: std.AutoArrayHashMapUnmanaged(String, Section), |
| 60 | section_table: std.array_hash_map.Auto(String, Section), |
| 61 | 61 | pseudo_section_table: std.array_hash_map.Auto(String, Symbol.Index), |
| 62 | 62 | object_section_table: std.array_hash_map.Auto(String, Symbol.Index), |
| 63 | | section_merges: std.AutoArrayHashMapUnmanaged(String, String), |
| 63 | section_merges: std.array_hash_map.Auto(String, String), |
| 64 | 64 | section_merge_pending_index: u32, |
| 65 | 65 | symbols: std.ArrayList(Symbol), |
| 66 | 66 | globals: std.array_hash_map.Auto(GlobalName, Symbol.Index), |
| ... | ... | @@ -480,7 +480,7 @@ pub const Member = struct { |
| 480 | 480 | kind: std.coff.ArchiveMemberHeader.Kind, |
| 481 | 481 | header_ni: MappedFile.Node.Index, |
| 482 | 482 | content_ni: MappedFile.Node.Index, |
| 483 | | first_linker_indices: std.AutoArrayHashMapUnmanaged(struct { |
| 483 | first_linker_indices: std.array_hash_map.Auto(struct { |
| 484 | 484 | mi: Member.Index, |
| 485 | 485 | name: String, |
| 486 | 486 | }, FirstLinkerIndex), |
| ... | ... | @@ -594,7 +594,7 @@ pub const Member = struct { |
| 594 | 594 | |
| 595 | 595 | pub const LongNamesTable = struct { |
| 596 | 596 | ni: MappedFile.Node.Index = .none, |
| 597 | | entries: std.AutoArrayHashMapUnmanaged(void, Entry), |
| 597 | entries: std.array_hash_map.Auto(void, Entry), |
| 598 | 598 | |
| 599 | 599 | pub const Entry = struct { |
| 600 | 600 | offset: u64, |
| ... | ... | @@ -621,8 +621,8 @@ pub const LongNamesTable = struct { |
| 621 | 621 | pub const SymbolTable = struct { |
| 622 | 622 | ni: MappedFile.Node.Index, |
| 623 | 623 | strings_ni: MappedFile.Node.Index, |
| 624 | | strings: std.AutoArrayHashMapUnmanaged(String, StringIndex), |
| 625 | | symbols: std.AutoArrayHashMapUnmanaged(Symbol.Index, SymbolTable.Index), |
| 624 | strings: std.array_hash_map.Auto(String, StringIndex), |
| 625 | symbols: std.array_hash_map.Auto(Symbol.Index, SymbolTable.Index), |
| 626 | 626 | pending_symbol_index: u32, |
| 627 | 627 | |
| 628 | 628 | // Resizing the symbol table node has the result of accumulating padding |
| ... | ... | @@ -681,7 +681,7 @@ pub const ExportTable = struct { |
| 681 | 681 | name_pointer_table_ni: MappedFile.Node.Index, |
| 682 | 682 | ordinal_table_ni: MappedFile.Node.Index, |
| 683 | 683 | name_table_ni: MappedFile.Node.Index, |
| 684 | | entries: std.AutoArrayHashMapUnmanaged(void, Entry), |
| 684 | entries: std.array_hash_map.Auto(void, Entry), |
| 685 | 685 | pending_sort: bool = false, |
| 686 | 686 | |
| 687 | 687 | pub const Entry = struct { |
| ... | ... | @@ -719,7 +719,7 @@ pub const ExportTable = struct { |
| 719 | 719 | pub const ImportTable = struct { |
| 720 | 720 | ni: MappedFile.Node.Index, |
| 721 | 721 | entries: std.array_hash_map.Auto(void, Entry), |
| 722 | | iat_symbol_indices: std.AutoArrayHashMapUnmanaged(struct { |
| 722 | iat_symbol_indices: std.array_hash_map.Auto(struct { |
| 723 | 723 | iti: ImportTable.Index, |
| 724 | 724 | name: String.Optional, |
| 725 | 725 | // If name == .none this is the ordinal, otherwise the hint |
| ... | ... | @@ -2767,7 +2767,7 @@ const GlobalOptions = struct { |
| 2767 | 2767 | fn getOrPutGlobalSymbol( |
| 2768 | 2768 | coff: *Coff, |
| 2769 | 2769 | opts: GlobalOptions, |
| 2770 | | ) !std.AutoArrayHashMapUnmanaged(GlobalName, Symbol.Index).GetOrPutResult { |
| 2770 | ) !std.array_hash_map.Auto(GlobalName, Symbol.Index).GetOrPutResult { |
| 2771 | 2771 | const comp = coff.base.comp; |
| 2772 | 2772 | const gpa = comp.gpa; |
| 2773 | 2773 | try coff.symbols.ensureUnusedCapacity(gpa, 1); |
| ... | ... | @@ -4134,7 +4134,7 @@ fn loadObject( |
| 4134 | 4134 | }; |
| 4135 | 4135 | |
| 4136 | 4136 | var num_global_symbols: u32 = 0; |
| 4137 | | var pending_symbols: std.AutoArrayHashMapUnmanaged(u32, PendingSymbol) = .empty; |
| 4137 | var pending_symbols: std.array_hash_map.Auto(u32, PendingSymbol) = .empty; |
| 4138 | 4138 | defer pending_symbols.deinit(gpa); |
| 4139 | 4139 | if (!is_archive) |
| 4140 | 4140 | try pending_symbols.ensureUnusedCapacity(gpa, header.number_of_symbols); |