authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-11-22 21:36:24-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2021-11-22 21:36:24-05:00
logaf1a5751d9e9f6dc3d9a3d7c37d4a9e08e2ef6d5
tree3f07da65c4f1093236bbe4c4d17c1e6416831960
parent065f40a3c5886c9087a4b752c014459bb1dac9ba
parentb3f4abbc5a5f0cb0a1b4cf8257f2402854292ed1
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #10165 from jmc-88/cbe

CBE: add .optional_single_mut_pointer and .optional_single_const_pointer to Type.childType

2 files changed, 4 insertions(+), 2 deletions(-)

src/type.zig+2
...@@ -2485,6 +2485,8 @@ pub const Type = extern union {...@@ -2485,6 +2485,8 @@ pub const Type = extern union {
2485 .vector => ty.castTag(.vector).?.data.elem_type,2485 .vector => ty.castTag(.vector).?.data.elem_type,
2486 .array => ty.castTag(.array).?.data.elem_type,2486 .array => ty.castTag(.array).?.data.elem_type,
2487 .array_sentinel => ty.castTag(.array_sentinel).?.data.elem_type,2487 .array_sentinel => ty.castTag(.array_sentinel).?.data.elem_type,
2488 .optional_single_mut_pointer,
2489 .optional_single_const_pointer,
2488 .single_const_pointer,2490 .single_const_pointer,
2489 .single_mut_pointer,2491 .single_mut_pointer,
2490 .many_const_pointer,2492 .many_const_pointer,
test/behavior.zig+2-2
...@@ -2,6 +2,7 @@ const builtin = @import("builtin");...@@ -2,6 +2,7 @@ const builtin = @import("builtin");
22
3test {3test {
4 // Tests that pass for stage1, stage2, and the C backend.4 // Tests that pass for stage1, stage2, and the C backend.
5 _ = @import("behavior/align.zig");
5 _ = @import("behavior/basic.zig");6 _ = @import("behavior/basic.zig");
6 _ = @import("behavior/bitcast.zig");7 _ = @import("behavior/bitcast.zig");
7 _ = @import("behavior/bool.zig");8 _ = @import("behavior/bool.zig");
...@@ -22,6 +23,7 @@ test {...@@ -22,6 +23,7 @@ test {
22 _ = @import("behavior/cast.zig");23 _ = @import("behavior/cast.zig");
23 _ = @import("behavior/defer.zig");24 _ = @import("behavior/defer.zig");
24 _ = @import("behavior/enum.zig");25 _ = @import("behavior/enum.zig");
26 _ = @import("behavior/error.zig");
25 _ = @import("behavior/hasdecl.zig");27 _ = @import("behavior/hasdecl.zig");
26 _ = @import("behavior/hasfield.zig");28 _ = @import("behavior/hasfield.zig");
27 _ = @import("behavior/if.zig");29 _ = @import("behavior/if.zig");
...@@ -42,7 +44,6 @@ test {...@@ -42,7 +44,6 @@ test {
4244
43 if (builtin.object_format != .c) {45 if (builtin.object_format != .c) {
44 // Tests that pass for stage1 and stage2 but not the C backend.46 // Tests that pass for stage1 and stage2 but not the C backend.
45 _ = @import("behavior/align.zig");
46 _ = @import("behavior/array.zig");47 _ = @import("behavior/array.zig");
47 _ = @import("behavior/atomics.zig");48 _ = @import("behavior/atomics.zig");
48 _ = @import("behavior/basic_llvm.zig");49 _ = @import("behavior/basic_llvm.zig");
...@@ -53,7 +54,6 @@ test {...@@ -53,7 +54,6 @@ test {
53 _ = @import("behavior/bugs/2006.zig");54 _ = @import("behavior/bugs/2006.zig");
54 _ = @import("behavior/bugs/3112.zig");55 _ = @import("behavior/bugs/3112.zig");
55 _ = @import("behavior/cast_llvm.zig");56 _ = @import("behavior/cast_llvm.zig");
56 _ = @import("behavior/error.zig");
57 _ = @import("behavior/eval.zig");57 _ = @import("behavior/eval.zig");
58 _ = @import("behavior/floatop.zig");58 _ = @import("behavior/floatop.zig");
59 _ = @import("behavior/fn.zig");59 _ = @import("behavior/fn.zig");