diff options
| author | Veikka Tuominen <git@vexu.eu> | 2022-03-04 10:06:25 +0200 |
|---|---|---|
| committer | Veikka Tuominen <git@vexu.eu> | 2022-03-08 11:23:38 +0200 |
| commit | 1f4a097117a75b053d620658df4cb4e81c40fe1a (patch) | |
| tree | 121da35d4732ae008b662911428198cae3a7cb71 /src/Sema.zig | |
| parent | ba17552b4eb8def495053013eebbe39fc324c8ae (diff) | |
| download | zig-1f4a097117a75b053d620658df4cb4e81c40fe1a.tar.gz zig-1f4a097117a75b053d620658df4cb4e81c40fe1a.zip | |
stage2: fix mem{set,cpy} for non comptime mutable pointers
Diffstat (limited to 'src/Sema.zig')
| -rw-r--r-- | src/Sema.zig | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index 99762f4807..e5e3d6e9b9 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -13831,13 +13831,11 @@ fn zirMemcpy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!void const src_ptr = try sema.coerce(block, wanted_src_ptr_ty, uncasted_src_ptr, src_src); const len = try sema.coerce(block, Type.usize, sema.resolveInst(extra.byte_count), len_src); - const maybe_dest_ptr_val = try sema.resolveDefinedValue(block, dest_src, dest_ptr); - const maybe_src_ptr_val = try sema.resolveDefinedValue(block, src_src, src_ptr); - const maybe_len_val = try sema.resolveDefinedValue(block, len_src, len); - - const runtime_src = if (maybe_dest_ptr_val) |dest_ptr_val| rs: { - if (maybe_src_ptr_val) |src_ptr_val| { - if (maybe_len_val) |len_val| { + const runtime_src = if (try sema.resolveDefinedValue(block, dest_src, dest_ptr)) |dest_ptr_val| rs: { + if (!dest_ptr_val.isComptimeMutablePtr()) break :rs dest_src; + if (try sema.resolveDefinedValue(block, src_src, src_ptr)) |src_ptr_val| { + if (!src_ptr_val.isComptimeMutablePtr()) break :rs src_src; + if (try sema.resolveDefinedValue(block, len_src, len)) |len_val| { _ = dest_ptr_val; _ = src_ptr_val; _ = len_val; @@ -13876,11 +13874,9 @@ fn zirMemset(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!void const value = try sema.coerce(block, elem_ty, sema.resolveInst(extra.byte), value_src); const len = try sema.coerce(block, Type.usize, sema.resolveInst(extra.byte_count), len_src); - const maybe_dest_ptr_val = try sema.resolveDefinedValue(block, dest_src, dest_ptr); - const maybe_len_val = try sema.resolveDefinedValue(block, len_src, len); - - const runtime_src = if (maybe_dest_ptr_val) |ptr_val| rs: { - if (maybe_len_val) |len_val| { + const runtime_src = if (try sema.resolveDefinedValue(block, dest_src, dest_ptr)) |ptr_val| rs: { + if (!ptr_val.isComptimeMutablePtr()) break :rs dest_src; + if (try sema.resolveDefinedValue(block, len_src, len)) |len_val| { if (try sema.resolveMaybeUndefVal(block, value_src, value)) |val| { _ = ptr_val; _ = len_val; |