| author |  Evan Haas <evan@lagerdata.com> 2022-03-24 23:41:11-07:00 |
| committer |  Veikka Tuominen <git@vexu.eu> 2022-03-25 14:47:51+02:00 |
| log | 0d5d353197114c614f8efde4a8c11c61a5f82519 |
| tree | eccb222a10c2181e7797ad845006893174e6efbc |
| parent | 9a127501f68d6034367094915ad53e8d57495786 |
translate-c: Use @Vector for vector expressions
Removes translate-c usage of std.meta.Vector, which was deprecated in d42d31f72f2 files changed, 9 insertions(+), 10 deletions(-)
src- translate_c.zig
- translate_c
src/translate_c.zig+2-2
| ... | ... | @@ -1441,7 +1441,7 @@ fn makeShuffleMask(c: *Context, scope: *Scope, expr: *const clang.ShuffleVectorE |
| 1441 | 1441 | assert(num_subexprs >= 3); // two source vectors + at least 1 index expression |
| 1442 | 1442 | const mask_len = num_subexprs - 2; |
| 1443 | 1443 | |
| 1444 | const mask_type = try Tag.std_meta_vector.create(c.arena, .{ | |
| 1444 | const mask_type = try Tag.vector.create(c.arena, .{ | |
| 1445 | 1445 | .lhs = try transCreateNodeNumber(c, mask_len, .int), |
| 1446 | 1446 | .rhs = try Tag.type.create(c.arena, "i32"), |
| 1447 | 1447 | }); |
| ... | ... | @@ -4800,7 +4800,7 @@ fn transType(c: *Context, scope: *Scope, ty: *const clang.Type, source_loc: clan |
| 4800 | 4800 | const vector_ty = @ptrCast(*const clang.VectorType, ty); |
| 4801 | 4801 | const num_elements = vector_ty.getNumElements(); |
| 4802 | 4802 | const element_qt = vector_ty.getElementType(); |
| 4803 | return Tag.std_meta_vector.create(c.arena, .{ | |
| 4803 | return Tag.vector.create(c.arena, .{ | |
| 4804 | 4804 | .lhs = try transCreateNodeNumber(c, num_elements, .int), |
| 4805 | 4805 | .rhs = try transQualType(c, scope, element_qt, source_loc), |
| 4806 | 4806 | }); |
src/translate_c/ast.zig+7-8
| ... | ... | @@ -192,8 +192,8 @@ pub const Node = extern union { |
| 192 | 192 | helpers_shuffle_vector_index, |
| 193 | 193 | /// @import("std").zig.c_translation.Macro.<operand> |
| 194 | 194 | helpers_macro, |
| 195 | /// @import("std").meta.Vector(lhs, rhs) | |
| 196 | std_meta_vector, | |
| 195 | /// @Vector(lhs, rhs) | |
| 196 | vector, | |
| 197 | 197 | /// @import("std").mem.zeroes(operand) |
| 198 | 198 | std_mem_zeroes, |
| 199 | 199 | /// @import("std").mem.zeroInit(lhs, rhs) |
| ... | ... | @@ -322,7 +322,7 @@ pub const Node = extern union { |
| 322 | 322 | .std_mem_zeroinit, |
| 323 | 323 | .helpers_flexible_array_type, |
| 324 | 324 | .helpers_shuffle_vector_index, |
| 325 | .std_meta_vector, | |
| 325 | .vector, | |
| 326 | 326 | .ptr_cast, |
| 327 | 327 | .div_exact, |
| 328 | 328 | .offset_of, |
| ... | ... | @@ -899,10 +899,9 @@ fn renderNode(c: *Context, node: Node) Allocator.Error!NodeIndex { |
| 899 | 899 | const import_node = try renderStdImport(c, &.{ "zig", "c_translation", "shuffleVectorIndex" }); |
| 900 | 900 | return renderCall(c, import_node, &.{ payload.lhs, payload.rhs }); |
| 901 | 901 | }, |
| 902 | .std_meta_vector => { | |
| 903 | const payload = node.castTag(.std_meta_vector).?.data; | |
| 904 | const import_node = try renderStdImport(c, &.{ "meta", "Vector" }); | |
| 905 | return renderCall(c, import_node, &.{ payload.lhs, payload.rhs }); | |
| 902 | .vector => { | |
| 903 | const payload = node.castTag(.vector).?.data; | |
| 904 | return renderBuiltinCall(c, "@Vector", &.{ payload.lhs, payload.rhs }); | |
| 906 | 905 | }, |
| 907 | 906 | .call => { |
| 908 | 907 | const payload = node.castTag(.call).?.data; |
| ... | ... | @@ -2221,7 +2220,7 @@ fn renderNodeGrouped(c: *Context, node: Node) !NodeIndex { |
| 2221 | 2220 | .typeof, |
| 2222 | 2221 | .typeinfo, |
| 2223 | 2222 | .std_meta_alignment, |
| 2224 | .std_meta_vector, | |
| 2223 | .vector, | |
| 2225 | 2224 | .helpers_sizeof, |
| 2226 | 2225 | .helpers_cast, |
| 2227 | 2226 | .helpers_promoteIntLiteral, |