diff options
| author | Benjamin Jurk <106487517+bnjmnjrk@users.noreply.github.com> | 2025-11-20 23:46:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-20 14:46:23 -0800 |
| commit | 4b5351bc0ddc248d6935d7d160a57cb4dfe4dedd (patch) | |
| tree | 8ce84d4e44a8ee1abaf0ef71d8287cec4b0f8c0a /src/codegen | |
| parent | db622f14c445b4f55981636543c546e22346abd5 (diff) | |
| download | zig-4b5351bc0ddc248d6935d7d160a57cb4dfe4dedd.tar.gz zig-4b5351bc0ddc248d6935d7d160a57cb4dfe4dedd.zip | |
update deprecated ArrayListUnmanaged usage (#25958)
Diffstat (limited to 'src/codegen')
| -rw-r--r-- | src/codegen/aarch64/Select.zig | 24 | ||||
| -rw-r--r-- | src/codegen/c.zig | 4 | ||||
| -rw-r--r-- | src/codegen/c/Type.zig | 12 | ||||
| -rw-r--r-- | src/codegen/llvm.zig | 26 | ||||
| -rw-r--r-- | src/codegen/riscv64/CodeGen.zig | 6 | ||||
| -rw-r--r-- | src/codegen/riscv64/Emit.zig | 2 | ||||
| -rw-r--r-- | src/codegen/sparc64/CodeGen.zig | 6 | ||||
| -rw-r--r-- | src/codegen/sparc64/Emit.zig | 4 | ||||
| -rw-r--r-- | src/codegen/spirv/Assembler.zig | 8 | ||||
| -rw-r--r-- | src/codegen/spirv/CodeGen.zig | 14 | ||||
| -rw-r--r-- | src/codegen/spirv/Module.zig | 4 | ||||
| -rw-r--r-- | src/codegen/spirv/Section.zig | 2 | ||||
| -rw-r--r-- | src/codegen/wasm/CodeGen.zig | 18 | ||||
| -rw-r--r-- | src/codegen/wasm/Mir.zig | 2 | ||||
| -rw-r--r-- | src/codegen/x86_64/CodeGen.zig | 16 | ||||
| -rw-r--r-- | src/codegen/x86_64/Emit.zig | 6 |
16 files changed, 77 insertions, 77 deletions
diff --git a/src/codegen/aarch64/Select.zig b/src/codegen/aarch64/Select.zig index 4799505b7f..93cb987820 100644 --- a/src/codegen/aarch64/Select.zig +++ b/src/codegen/aarch64/Select.zig @@ -7,24 +7,24 @@ nav_index: InternPool.Nav.Index, def_order: std.AutoArrayHashMapUnmanaged(Air.Inst.Index, void), blocks: std.AutoArrayHashMapUnmanaged(Air.Inst.Index, Block), loops: std.AutoArrayHashMapUnmanaged(Air.Inst.Index, Loop), -active_loops: std.ArrayListUnmanaged(Loop.Index), +active_loops: std.ArrayList(Loop.Index), loop_live: struct { set: std.AutoArrayHashMapUnmanaged(struct { Loop.Index, Air.Inst.Index }, void), - list: std.ArrayListUnmanaged(Air.Inst.Index), + list: std.ArrayList(Air.Inst.Index), }, dom_start: u32, dom_len: u32, -dom: std.ArrayListUnmanaged(DomInt), +dom: std.ArrayList(DomInt), // Wip Mir saved_registers: std.enums.EnumSet(Register.Alias), -instructions: std.ArrayListUnmanaged(codegen.aarch64.encoding.Instruction), -literals: std.ArrayListUnmanaged(u32), -nav_relocs: std.ArrayListUnmanaged(codegen.aarch64.Mir.Reloc.Nav), -uav_relocs: std.ArrayListUnmanaged(codegen.aarch64.Mir.Reloc.Uav), -lazy_relocs: std.ArrayListUnmanaged(codegen.aarch64.Mir.Reloc.Lazy), -global_relocs: std.ArrayListUnmanaged(codegen.aarch64.Mir.Reloc.Global), -literal_relocs: std.ArrayListUnmanaged(codegen.aarch64.Mir.Reloc.Literal), +instructions: std.ArrayList(codegen.aarch64.encoding.Instruction), +literals: std.ArrayList(u32), +nav_relocs: std.ArrayList(codegen.aarch64.Mir.Reloc.Nav), +uav_relocs: std.ArrayList(codegen.aarch64.Mir.Reloc.Uav), +lazy_relocs: std.ArrayList(codegen.aarch64.Mir.Reloc.Lazy), +global_relocs: std.ArrayList(codegen.aarch64.Mir.Reloc.Global), +literal_relocs: std.ArrayList(codegen.aarch64.Mir.Reloc.Literal), // Stack Frame returns: bool, @@ -44,7 +44,7 @@ stack_align: InternPool.Alignment, // Value Tracking live_registers: LiveRegisters, live_values: std.AutoHashMapUnmanaged(Air.Inst.Index, Value.Index), -values: std.ArrayListUnmanaged(Value), +values: std.ArrayList(Value), pub const LiveRegisters = std.enums.EnumArray(Register.Alias, Value.Index); @@ -11274,7 +11274,7 @@ pub fn dumpValues(isel: *Select, which: enum { only_referenced, all }) void { const ip = &zcu.intern_pool; const nav = ip.getNav(isel.nav_index); - var reverse_live_values: std.AutoArrayHashMapUnmanaged(Value.Index, std.ArrayListUnmanaged(Air.Inst.Index)) = .empty; + var reverse_live_values: std.AutoArrayHashMapUnmanaged(Value.Index, std.ArrayList(Air.Inst.Index)) = .empty; defer { for (reverse_live_values.values()) |*list| list.deinit(gpa); reverse_live_values.deinit(gpa); diff --git a/src/codegen/c.zig b/src/codegen/c.zig index 91614bf2df..428d3f4c64 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -431,7 +431,7 @@ pub const Function = struct { lazy_fns: LazyFnMap, func_index: InternPool.Index, /// All the locals, to be emitted at the top of the function. - locals: std.ArrayListUnmanaged(Local) = .empty, + locals: std.ArrayList(Local) = .empty, /// Which locals are available for reuse, based on Type. free_locals_map: LocalsMap = .{}, /// Locals which will not be freed by Liveness. This is used after a @@ -752,7 +752,7 @@ pub const DeclGen = struct { fwd_decl: Writer.Allocating, error_msg: ?*Zcu.ErrorMsg, ctype_pool: CType.Pool, - scratch: std.ArrayListUnmanaged(u32), + scratch: std.ArrayList(u32), /// This map contains all the UAVs we saw generating this function. /// `link.C` will merge them into its `uavs`/`aligned_uavs` fields. /// Key is the value of the UAV; value is the UAV's alignment, or diff --git a/src/codegen/c/Type.zig b/src/codegen/c/Type.zig index ac535a47d1..f575a40197 100644 --- a/src/codegen/c/Type.zig +++ b/src/codegen/c/Type.zig @@ -971,11 +971,11 @@ pub const Info = union(enum) { pub const Pool = struct { map: Map, items: std.MultiArrayList(Item), - extra: std.ArrayListUnmanaged(u32), + extra: std.ArrayList(u32), string_map: Map, - string_indices: std.ArrayListUnmanaged(u32), - string_bytes: std.ArrayListUnmanaged(u8), + string_indices: std.ArrayList(u32), + string_bytes: std.ArrayList(u8), const Map = std.AutoArrayHashMapUnmanaged(void, void); @@ -1396,7 +1396,7 @@ pub const Pool = struct { pub fn fromType( pool: *Pool, allocator: std.mem.Allocator, - scratch: *std.ArrayListUnmanaged(u32), + scratch: *std.ArrayList(u32), ty: Type, pt: Zcu.PerThread, mod: *Module, @@ -3271,7 +3271,7 @@ pub const Pool = struct { addExtraAssumeCapacityTo(&pool.extra, Extra, extra); } fn addExtraAssumeCapacityTo( - array: *std.ArrayListUnmanaged(u32), + array: *std.ArrayList(u32), comptime Extra: type, extra: Extra, ) void { @@ -3309,7 +3309,7 @@ pub const Pool = struct { } fn addHashedExtraAssumeCapacityTo( pool: *Pool, - array: *std.ArrayListUnmanaged(u32), + array: *std.ArrayList(u32), hasher: *Hasher, comptime Extra: type, extra: Extra, diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 8d51fea0c3..ad76cc8f36 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -523,8 +523,8 @@ pub const Object = struct { debug_enums_fwd_ref: Builder.Metadata.Optional, debug_globals_fwd_ref: Builder.Metadata.Optional, - debug_enums: std.ArrayListUnmanaged(Builder.Metadata), - debug_globals: std.ArrayListUnmanaged(Builder.Metadata), + debug_enums: std.ArrayList(Builder.Metadata), + debug_globals: std.ArrayList(Builder.Metadata), debug_file_map: std.AutoHashMapUnmanaged(Zcu.File.Index, Builder.Metadata), debug_type_map: std.AutoHashMapUnmanaged(InternPool.Index, Builder.Metadata), @@ -571,7 +571,7 @@ pub const Object = struct { struct_field_map: std.AutoHashMapUnmanaged(ZigStructField, c_uint), /// Values for `@llvm.used`. - used: std.ArrayListUnmanaged(Builder.Constant), + used: std.ArrayList(Builder.Constant), const ZigStructField = struct { struct_ty: InternPool.Index, @@ -1298,7 +1298,7 @@ pub const Object = struct { // instructions. Depending on the calling convention, this list is not necessarily // a bijection with the actual LLVM parameters of the function. const gpa = o.gpa; - var args: std.ArrayListUnmanaged(Builder.Value) = .empty; + var args: std.ArrayList(Builder.Value) = .empty; defer args.deinit(gpa); { @@ -2318,7 +2318,7 @@ pub const Object = struct { switch (ip.indexToKey(ty.toIntern())) { .tuple_type => |tuple| { - var fields: std.ArrayListUnmanaged(Builder.Metadata) = .empty; + var fields: std.ArrayList(Builder.Metadata) = .empty; defer fields.deinit(gpa); try fields.ensureUnusedCapacity(gpa, tuple.types.len); @@ -2392,7 +2392,7 @@ pub const Object = struct { const struct_type = zcu.typeToStruct(ty).?; - var fields: std.ArrayListUnmanaged(Builder.Metadata) = .empty; + var fields: std.ArrayList(Builder.Metadata) = .empty; defer fields.deinit(gpa); try fields.ensureUnusedCapacity(gpa, struct_type.field_types.len); @@ -2484,7 +2484,7 @@ pub const Object = struct { return debug_union_type; } - var fields: std.ArrayListUnmanaged(Builder.Metadata) = .empty; + var fields: std.ArrayList(Builder.Metadata) = .empty; defer fields.deinit(gpa); try fields.ensureUnusedCapacity(gpa, union_type.loadTagType(ip).names.len); @@ -3273,7 +3273,7 @@ pub const Object = struct { return int_ty; } - var llvm_field_types: std.ArrayListUnmanaged(Builder.Type) = .empty; + var llvm_field_types: std.ArrayList(Builder.Type) = .empty; defer llvm_field_types.deinit(o.gpa); // Although we can estimate how much capacity to add, these cannot be // relied upon because of the recursive calls to lowerType below. @@ -3342,7 +3342,7 @@ pub const Object = struct { return ty; }, .tuple_type => |tuple_type| { - var llvm_field_types: std.ArrayListUnmanaged(Builder.Type) = .empty; + var llvm_field_types: std.ArrayList(Builder.Type) = .empty; defer llvm_field_types.deinit(o.gpa); // Although we can estimate how much capacity to add, these cannot be // relied upon because of the recursive calls to lowerType below. @@ -3531,7 +3531,7 @@ pub const Object = struct { const target = zcu.getTarget(); const ret_ty = try lowerFnRetTy(o, pt, fn_info); - var llvm_params: std.ArrayListUnmanaged(Builder.Type) = .empty; + var llvm_params: std.ArrayList(Builder.Type) = .empty; defer llvm_params.deinit(o.gpa); if (firstParamSRet(fn_info, zcu, target)) { @@ -4741,7 +4741,7 @@ pub const FuncGen = struct { const Fuzz = struct { counters_variable: Builder.Variable.Index, - pcs: std.ArrayListUnmanaged(Builder.Constant), + pcs: std.ArrayList(Builder.Constant), fn deinit(f: *Fuzz, gpa: Allocator) void { f.pcs.deinit(gpa); @@ -7251,7 +7251,7 @@ pub const FuncGen = struct { const inputs: []const Air.Inst.Ref = @ptrCast(self.air.extra.items[extra_i..][0..extra.data.inputs_len]); extra_i += inputs.len; - var llvm_constraints: std.ArrayListUnmanaged(u8) = .empty; + var llvm_constraints: std.ArrayList(u8) = .empty; defer llvm_constraints.deinit(gpa); var arena_allocator = std.heap.ArenaAllocator.init(gpa); @@ -13133,7 +13133,7 @@ fn maxIntConst(b: *Builder, max_ty: Type, as_ty: Builder.Type, zcu: *const Zcu) /// Appends zero or more LLVM constraints to `llvm_constraints`, returning how many were added. fn appendConstraints( gpa: Allocator, - llvm_constraints: *std.ArrayListUnmanaged(u8), + llvm_constraints: *std.ArrayList(u8), zig_name: []const u8, target: *const std.Target, ) error{OutOfMemory}!usize { diff --git a/src/codegen/riscv64/CodeGen.zig b/src/codegen/riscv64/CodeGen.zig index ac176c4780..5dc89d9af9 100644 --- a/src/codegen/riscv64/CodeGen.zig +++ b/src/codegen/riscv64/CodeGen.zig @@ -90,7 +90,7 @@ scope_generation: u32, /// The value is an offset into the `Function` `code` from the beginning. /// To perform the reloc, write 32-bit signed little-endian integer /// which is a relative jump, based on the address following the reloc. -exitlude_jump_relocs: std.ArrayListUnmanaged(usize) = .empty, +exitlude_jump_relocs: std.ArrayList(usize) = .empty, reused_operands: std.StaticBitSet(Air.Liveness.bpi - 1) = undefined, @@ -609,7 +609,7 @@ const FrameAlloc = struct { }; const BlockData = struct { - relocs: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty, + relocs: std.ArrayList(Mir.Inst.Index) = .empty, state: State, fn deinit(bd: *BlockData, gpa: Allocator) void { @@ -6200,7 +6200,7 @@ fn airAsm(func: *Func, inst: Air.Inst.Index) !void { const Label = struct { target: Mir.Inst.Index = undefined, - pending_relocs: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty, + pending_relocs: std.ArrayList(Mir.Inst.Index) = .empty, const Kind = enum { definition, reference }; diff --git a/src/codegen/riscv64/Emit.zig b/src/codegen/riscv64/Emit.zig index 64a476007c..67732cc9c0 100644 --- a/src/codegen/riscv64/Emit.zig +++ b/src/codegen/riscv64/Emit.zig @@ -11,7 +11,7 @@ prev_di_column: u32, prev_di_pc: usize, code_offset_mapping: std.AutoHashMapUnmanaged(Mir.Inst.Index, usize) = .empty, -relocs: std.ArrayListUnmanaged(Reloc) = .empty, +relocs: std.ArrayList(Reloc) = .empty, pub const Error = Lower.Error || std.Io.Writer.Error || error{ EmitFail, diff --git a/src/codegen/sparc64/CodeGen.zig b/src/codegen/sparc64/CodeGen.zig index c681137bae..b3416dcedf 100644 --- a/src/codegen/sparc64/CodeGen.zig +++ b/src/codegen/sparc64/CodeGen.zig @@ -68,7 +68,7 @@ stack_align: Alignment, /// MIR Instructions mir_instructions: std.MultiArrayList(Mir.Inst) = .{}, /// MIR extra data -mir_extra: std.ArrayListUnmanaged(u32) = .empty, +mir_extra: std.ArrayList(u32) = .empty, /// Byte offset within the source file of the ending curly. end_di_line: u32, @@ -77,7 +77,7 @@ end_di_column: u32, /// The value is an offset into the `Function` `code` from the beginning. /// To perform the reloc, write 32-bit signed little-endian integer /// which is a relative jump, based on the address following the reloc. -exitlude_jump_relocs: std.ArrayListUnmanaged(usize) = .empty, +exitlude_jump_relocs: std.ArrayList(usize) = .empty, reused_operands: std.StaticBitSet(Air.Liveness.bpi - 1) = undefined, @@ -218,7 +218,7 @@ const StackAllocation = struct { }; const BlockData = struct { - relocs: std.ArrayListUnmanaged(Mir.Inst.Index), + relocs: std.ArrayList(Mir.Inst.Index), /// The first break instruction encounters `null` here and chooses a /// machine code value for the block result, populating this field. /// Following break instructions encounter that value and use it for diff --git a/src/codegen/sparc64/Emit.zig b/src/codegen/sparc64/Emit.zig index 26282b09ab..9442fc1908 100644 --- a/src/codegen/sparc64/Emit.zig +++ b/src/codegen/sparc64/Emit.zig @@ -32,7 +32,7 @@ prev_di_pc: usize, branch_types: std.AutoHashMapUnmanaged(Mir.Inst.Index, BranchType) = .empty, /// For every forward branch, maps the target instruction to a list of /// branches which branch to this target instruction -branch_forward_origins: std.AutoHashMapUnmanaged(Mir.Inst.Index, std.ArrayListUnmanaged(Mir.Inst.Index)) = .empty, +branch_forward_origins: std.AutoHashMapUnmanaged(Mir.Inst.Index, std.ArrayList(Mir.Inst.Index)) = .empty, /// For backward branches: stores the code offset of the target /// instruction /// @@ -568,7 +568,7 @@ fn lowerBranches(emit: *Emit) !void { if (emit.branch_forward_origins.getPtr(target_inst)) |origin_list| { try origin_list.append(gpa, inst); } else { - var origin_list: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty; + var origin_list: std.ArrayList(Mir.Inst.Index) = .empty; try origin_list.append(gpa, inst); try emit.branch_forward_origins.put(gpa, target_inst, origin_list); } diff --git a/src/codegen/spirv/Assembler.zig b/src/codegen/spirv/Assembler.zig index a47cd49644..5b19f960a7 100644 --- a/src/codegen/spirv/Assembler.zig +++ b/src/codegen/spirv/Assembler.zig @@ -14,16 +14,16 @@ const StorageClass = spec.StorageClass; const Assembler = @This(); cg: *CodeGen, -errors: std.ArrayListUnmanaged(ErrorMsg) = .empty, +errors: std.ArrayList(ErrorMsg) = .empty, src: []const u8 = undefined, /// `ass.src` tokenized. -tokens: std.ArrayListUnmanaged(Token) = .empty, +tokens: std.ArrayList(Token) = .empty, current_token: u32 = 0, /// The instruction that is currently being parsed or has just been parsed. inst: struct { opcode: Opcode = undefined, - operands: std.ArrayListUnmanaged(Operand) = .empty, - string_bytes: std.ArrayListUnmanaged(u8) = .empty, + operands: std.ArrayList(Operand) = .empty, + string_bytes: std.ArrayList(u8) = .empty, fn result(ass: @This()) ?AsmValue.Ref { for (ass.operands.items[0..@min(ass.operands.items.len, 2)]) |op| { diff --git a/src/codegen/spirv/CodeGen.zig b/src/codegen/spirv/CodeGen.zig index 20aad56225..c34dd96e25 100644 --- a/src/codegen/spirv/CodeGen.zig +++ b/src/codegen/spirv/CodeGen.zig @@ -83,7 +83,7 @@ const ControlFlow = union(enum) { selection: struct { /// In order to know which merges we still need to do, we need to keep /// a stack of those. - merge_stack: std.ArrayListUnmanaged(SelectionMerge) = .empty, + merge_stack: std.ArrayList(SelectionMerge) = .empty, }, /// For a `loop` type block, we can early-exit the block by /// jumping to the loop exit node, and we don't need to generate @@ -91,7 +91,7 @@ const ControlFlow = union(enum) { loop: struct { /// The next block to jump to can be determined from any number /// of conditions that jump to the loop exit. - merges: std.ArrayListUnmanaged(Incoming) = .empty, + merges: std.ArrayList(Incoming) = .empty, /// The label id of the loop's merge block. merge_block: Id, }, @@ -105,7 +105,7 @@ const ControlFlow = union(enum) { } }; /// This determines how exits from the current block must be handled. - block_stack: std.ArrayListUnmanaged(*Structured.Block) = .empty, + block_stack: std.ArrayList(*Structured.Block) = .empty, block_results: std.AutoHashMapUnmanaged(Air.Inst.Index, Id) = .empty, }; @@ -117,7 +117,7 @@ const ControlFlow = union(enum) { const Block = struct { label: ?Id = null, - incoming_blocks: std.ArrayListUnmanaged(Incoming) = .empty, + incoming_blocks: std.ArrayList(Incoming) = .empty, }; /// We need to keep track of result ids for block labels, as well as the 'incoming' @@ -151,9 +151,9 @@ control_flow: ControlFlow, base_line: u32, block_label: Id = .none, next_arg_index: u32 = 0, -args: std.ArrayListUnmanaged(Id) = .empty, +args: std.ArrayList(Id) = .empty, inst_results: std.AutoHashMapUnmanaged(Air.Inst.Index, Id) = .empty, -id_scratch: std.ArrayListUnmanaged(Id) = .empty, +id_scratch: std.ArrayList(Id) = .empty, prologue: Section = .{}, body: Section = .{}, error_msg: ?*Zcu.ErrorMsg = null, @@ -5783,7 +5783,7 @@ fn airSwitchBr(cg: *CodeGen, inst: Air.Inst.Index) !void { } } - var incoming_structured_blocks: std.ArrayListUnmanaged(ControlFlow.Structured.Block.Incoming) = .empty; + var incoming_structured_blocks: std.ArrayList(ControlFlow.Structured.Block.Incoming) = .empty; defer incoming_structured_blocks.deinit(gpa); if (cg.control_flow == .structured) { diff --git a/src/codegen/spirv/Module.zig b/src/codegen/spirv/Module.zig index 3189a422f8..6b6c1f0ab3 100644 --- a/src/codegen/spirv/Module.zig +++ b/src/codegen/spirv/Module.zig @@ -26,8 +26,8 @@ zcu: *Zcu, nav_link: std.AutoHashMapUnmanaged(InternPool.Nav.Index, Decl.Index) = .empty, uav_link: std.AutoHashMapUnmanaged(struct { InternPool.Index, spec.StorageClass }, Decl.Index) = .empty, intern_map: std.AutoHashMapUnmanaged(struct { InternPool.Index, Repr }, Id) = .empty, -decls: std.ArrayListUnmanaged(Decl) = .empty, -decl_deps: std.ArrayListUnmanaged(Decl.Index) = .empty, +decls: std.ArrayList(Decl) = .empty, +decl_deps: std.ArrayList(Decl.Index) = .empty, entry_points: std.AutoArrayHashMapUnmanaged(Id, EntryPoint) = .empty, /// This map serves a dual purpose: /// - It keeps track of pointers that are currently being emitted, so that we can tell diff --git a/src/codegen/spirv/Section.zig b/src/codegen/spirv/Section.zig index d5748afa39..5059b2c866 100644 --- a/src/codegen/spirv/Section.zig +++ b/src/codegen/spirv/Section.zig @@ -13,7 +13,7 @@ const Log2Word = std.math.Log2Int(Word); const Opcode = spec.Opcode; -instructions: std.ArrayListUnmanaged(Word) = .empty, +instructions: std.ArrayList(Word) = .empty, pub fn deinit(section: *Section, allocator: Allocator) void { section.instructions.deinit(allocator); diff --git a/src/codegen/wasm/CodeGen.zig b/src/codegen/wasm/CodeGen.zig index 1d83474cc3..5d78b46702 100644 --- a/src/codegen/wasm/CodeGen.zig +++ b/src/codegen/wasm/CodeGen.zig @@ -53,7 +53,7 @@ func_index: InternPool.Index, /// When we return from a branch, the branch will be popped from this list, /// which means branches can only contain references from within its own branch, /// or a branch higher (lower index) in the tree. -branches: std.ArrayListUnmanaged(Branch) = .empty, +branches: std.ArrayList(Branch) = .empty, /// Table to save `WValue`'s generated by an `Air.Inst` // values: ValueTable, /// Mapping from Air.Inst.Index to block ids @@ -73,7 +73,7 @@ arg_index: u32 = 0, /// List of simd128 immediates. Each value is stored as an array of bytes. /// This list will only be populated for 128bit-simd values when the target features /// are enabled also. -simd_immediates: std.ArrayListUnmanaged([16]u8) = .empty, +simd_immediates: std.ArrayList([16]u8) = .empty, /// The Target we're emitting (used to call intInfo) target: *const std.Target, ptr_size: enum { wasm32, wasm64 }, @@ -81,10 +81,10 @@ pt: Zcu.PerThread, /// List of MIR Instructions mir_instructions: std.MultiArrayList(Mir.Inst), /// Contains extra data for MIR -mir_extra: std.ArrayListUnmanaged(u32), +mir_extra: std.ArrayList(u32), /// List of all locals' types generated throughout this declaration /// used to emit locals count at start of 'code' section. -mir_locals: std.ArrayListUnmanaged(std.wasm.Valtype), +mir_locals: std.ArrayList(std.wasm.Valtype), /// Set of all UAVs referenced by this function. Key is the UAV value, value is the alignment. /// `.none` means naturally aligned. An explicit alignment is never less than the natural alignment. mir_uavs: std.AutoArrayHashMapUnmanaged(InternPool.Index, Alignment), @@ -121,19 +121,19 @@ stack_alignment: Alignment = .@"16", // allows us to re-use locals that are no longer used. e.g. a temporary local. /// A list of indexes which represents a local of valtype `i32`. /// It is illegal to store a non-i32 valtype in this list. -free_locals_i32: std.ArrayListUnmanaged(u32) = .empty, +free_locals_i32: std.ArrayList(u32) = .empty, /// A list of indexes which represents a local of valtype `i64`. /// It is illegal to store a non-i64 valtype in this list. -free_locals_i64: std.ArrayListUnmanaged(u32) = .empty, +free_locals_i64: std.ArrayList(u32) = .empty, /// A list of indexes which represents a local of valtype `f32`. /// It is illegal to store a non-f32 valtype in this list. -free_locals_f32: std.ArrayListUnmanaged(u32) = .empty, +free_locals_f32: std.ArrayList(u32) = .empty, /// A list of indexes which represents a local of valtype `f64`. /// It is illegal to store a non-f64 valtype in this list. -free_locals_f64: std.ArrayListUnmanaged(u32) = .empty, +free_locals_f64: std.ArrayList(u32) = .empty, /// A list of indexes which represents a local of valtype `v127`. /// It is illegal to store a non-v128 valtype in this list. -free_locals_v128: std.ArrayListUnmanaged(u32) = .empty, +free_locals_v128: std.ArrayList(u32) = .empty, /// When in debug mode, this tracks if no `finishAir` was missed. /// Forgetting to call `finishAir` will cause the result to not be diff --git a/src/codegen/wasm/Mir.zig b/src/codegen/wasm/Mir.zig index af6e0eb40b..7f0ea1bc02 100644 --- a/src/codegen/wasm/Mir.zig +++ b/src/codegen/wasm/Mir.zig @@ -669,7 +669,7 @@ pub fn deinit(mir: *Mir, gpa: std.mem.Allocator) void { mir.* = undefined; } -pub fn lower(mir: *const Mir, wasm: *Wasm, code: *std.ArrayListUnmanaged(u8)) std.mem.Allocator.Error!void { +pub fn lower(mir: *const Mir, wasm: *Wasm, code: *std.ArrayList(u8)) std.mem.Allocator.Error!void { const gpa = wasm.base.comp.gpa; // Write the locals in the prologue of the function body. diff --git a/src/codegen/x86_64/CodeGen.zig b/src/codegen/x86_64/CodeGen.zig index b43b359de1..80798969eb 100644 --- a/src/codegen/x86_64/CodeGen.zig +++ b/src/codegen/x86_64/CodeGen.zig @@ -113,21 +113,21 @@ eflags_inst: ?Air.Inst.Index = null, /// MIR Instructions mir_instructions: std.MultiArrayList(Mir.Inst) = .empty, /// MIR extra data -mir_extra: std.ArrayListUnmanaged(u32) = .empty, -mir_string_bytes: std.ArrayListUnmanaged(u8) = .empty, +mir_extra: std.ArrayList(u32) = .empty, +mir_string_bytes: std.ArrayList(u8) = .empty, mir_strings: std.HashMapUnmanaged( u32, void, std.hash_map.StringIndexContext, std.hash_map.default_max_load_percentage, ) = .empty, -mir_locals: std.ArrayListUnmanaged(Mir.Local) = .empty, -mir_table: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty, +mir_locals: std.ArrayList(Mir.Local) = .empty, +mir_table: std.ArrayList(Mir.Inst.Index) = .empty, /// The value is an offset into the `Function` `code` from the beginning. /// To perform the reloc, write 32-bit signed little-endian integer /// which is a relative jump, based on the address following the reloc. -epilogue_relocs: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty, +epilogue_relocs: std.ArrayList(Mir.Inst.Index) = .empty, reused_operands: std.StaticBitSet(Air.Liveness.bpi - 1) = undefined, inst_tracking: InstTrackingMap = .empty, @@ -156,7 +156,7 @@ loop_switches: std.AutoHashMapUnmanaged(Air.Inst.Index, struct { min: Value, else_relocs: union(enum) { @"unreachable", - forward: std.ArrayListUnmanaged(Mir.Inst.Index), + forward: std.ArrayList(Mir.Inst.Index), backward: Mir.Inst.Index, }, }) = .empty, @@ -855,7 +855,7 @@ const FrameAlloc = struct { }; const BlockData = struct { - relocs: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty, + relocs: std.ArrayList(Mir.Inst.Index) = .empty, state: State, fn deinit(self: *BlockData, gpa: Allocator) void { @@ -177329,7 +177329,7 @@ fn airAsm(self: *CodeGen, inst: Air.Inst.Index) !void { const Label = struct { target: Mir.Inst.Index = undefined, - pending_relocs: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty, + pending_relocs: std.ArrayList(Mir.Inst.Index) = .empty, const Kind = enum { definition, reference }; diff --git a/src/codegen/x86_64/Emit.zig b/src/codegen/x86_64/Emit.zig index 206b3414e3..18846aaf99 100644 --- a/src/codegen/x86_64/Emit.zig +++ b/src/codegen/x86_64/Emit.zig @@ -12,9 +12,9 @@ prev_di_loc: Loc, /// Relative to the beginning of `code`. prev_di_pc: usize, -code_offset_mapping: std.ArrayListUnmanaged(u32), -relocs: std.ArrayListUnmanaged(Reloc), -table_relocs: std.ArrayListUnmanaged(TableReloc), +code_offset_mapping: std.ArrayList(u32), +relocs: std.ArrayList(Reloc), +table_relocs: std.ArrayList(TableReloc), pub const Error = Lower.Error || error{ EmitFail, |
