Commit 56c5b665a1f93fd16a711986e25e4d7c5dfed163 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-09-29 15:19:09-04:00
committer	GitHub <noreply@github.com> 2020-09-29 15:19:09-04:00
log	56c5b665a1f93fd16a711986e25e4d7c5dfed163
tree	287b07063d2097ab77361df849c3444caab4383b
parent	a1ae3f92c1cdbae2333d26ad5da224b91e20cb6f
parent	cbbcf609688d70ce9e45bde444b2904b39a0ae2c
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #6448 from LemonBoy/some-vec-fixes

Some vector fixes

3 files changed, 31 insertions(+), 11 deletions(-)

src
- ir.cpp
test
- compile_errors.zig
- stage1
  - behavior
    vector.zig

src/ir.cpp+14-10

 @@ -16715,16 +16715,12 @@ static IrInstGen *ir_analyze_bin_op_cmp_numeric(IrAnalyze *ira, IrInst *source_i
     }
     ZigType *dest_float_type = nullptr;
     uint32_t op1_bits;
-    if (instr_is_comptime(op1)) {
+    if (instr_is_comptime(op1) && result_type->id != ZigTypeIdVector) {
         ZigValue *op1_val = ir_resolve_const(ira, op1, UndefOk);
         if (op1_val == nullptr)
             return ira->codegen->invalid_inst_gen;
         if (op1_val->special == ConstValSpecialUndef)
             return ir_const_undef(ira, source_instr, ira->codegen->builtin_types.entry_bool);
-        if (result_type->id == ZigTypeIdVector) {
-            ir_add_error(ira, &op1->base, buf_sprintf("compiler bug: TODO: support comptime vector here"));
-            return ira->codegen->invalid_inst_gen;
-        }
         bool is_unsigned;
         if (op1_is_float) {
             BigInt bigint = {};
 @@ -16750,6 +16746,7 @@ static IrInstGen *ir_analyze_bin_op_cmp_numeric(IrAnalyze *ira, IrInst *source_i
             op1_bits += 1;
         }
     } else if (op1_is_float) {
+        ir_assert(op1_scalar_type->id == ZigTypeIdFloat, source_instr);
         dest_float_type = op1_scalar_type;
     } else {
         ir_assert(op1_scalar_type->id == ZigTypeIdInt, source_instr);
 @@ -16759,16 +16756,12 @@ static IrInstGen *ir_analyze_bin_op_cmp_numeric(IrAnalyze *ira, IrInst *source_i
         }
     }
     uint32_t op2_bits;
-    if (instr_is_comptime(op2)) {
+    if (instr_is_comptime(op2) && result_type->id != ZigTypeIdVector) {
         ZigValue *op2_val = ir_resolve_const(ira, op2, UndefOk);
         if (op2_val == nullptr)
             return ira->codegen->invalid_inst_gen;
         if (op2_val->special == ConstValSpecialUndef)
             return ir_const_undef(ira, source_instr, ira->codegen->builtin_types.entry_bool);
-        if (result_type->id == ZigTypeIdVector) {
-            ir_add_error(ira, &op2->base, buf_sprintf("compiler bug: TODO: support comptime vector here"));
-            return ira->codegen->invalid_inst_gen;
-        }
         bool is_unsigned;
         if (op2_is_float) {
             BigInt bigint = {};
 @@ -16794,6 +16787,7 @@ static IrInstGen *ir_analyze_bin_op_cmp_numeric(IrAnalyze *ira, IrInst *source_i
             op2_bits += 1;
         }
     } else if (op2_is_float) {
+        ir_assert(op2_scalar_type->id == ZigTypeIdFloat, source_instr);
         dest_float_type = op2_scalar_type;
     } else {
         ir_assert(op2_scalar_type->id == ZigTypeIdInt, source_instr);
 @@ -21934,7 +21928,17 @@ static IrInstGen *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstSrcElemP
                 return ira->codegen->invalid_inst_gen;
             }
             safety_check_on = false;
+        } else if (array_type->id == ZigTypeIdVector) {
+            uint64_t vector_len = array_type->data.vector.len;
+            if (index >= vector_len) {
+                ir_add_error_node(ira, elem_ptr_instruction->base.base.source_node,
+                    buf_sprintf("index %" ZIG_PRI_u64 " outside vector of size %" ZIG_PRI_u64,
+                            index, vector_len));
+                return ira->codegen->invalid_inst_gen;
+            }
+            safety_check_on = false;
         }
         if (array_type->id == ZigTypeIdVector) {
             ZigType *elem_type = array_type->data.vector.elem_type;
             uint32_t host_vec_len = array_type->data.vector.len;

test/compile_errors.zig+9-1

 @@ -2,6 +2,14 @@ const tests = @import("tests.zig");
 const std = @import("std");
 pub fn addCases(cases: *tests.CompileErrorContext) void {
+    cases.add("slice sentinel mismatch",
+        \\export fn entry() void {
+        \\    const x = @import("std").meta.Vector(3, f32){ 25, 75, 5, 0 };
+        \\}
+    , &[_][]const u8{
+        "tmp.zig:2:62: error: index 3 outside vector of size 3",
+    });
     cases.add("slice sentinel mismatch",
         \\export fn entry() void {
         \\    const y: [:1]const u8 = &[_:2]u8{ 1, 2 };
 @@ -7548,7 +7556,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
     });
     cases.add( // fixed bug #2032
-    "compile diagnostic string for top level decl type",
+        "compile diagnostic string for top level decl type",
         \\export fn entry() void {
         \\    var foo: u32 = @This(){};
         \\}

test/stage1/behavior/vector.zig+8

...	@@ -274,6 +274,14 @@ test "vector comparison operators" {	...	@@ -274,6 +274,14 @@ test "vector comparison operators" {
274	expectEqual(@splat(4, true), v1 != v3);	274	expectEqual(@splat(4, true), v1 != v3);
275	expectEqual(@splat(4, false), v1 != v2);	275	expectEqual(@splat(4, false), v1 != v2);
276	}	276	}
		277	{
		278	// Comptime-known LHS/RHS
		279	var v1: @Vector(4, u32) = [_]u32{ 2, 1, 2, 1 };
		280	const v2 = @splat(4, @as(u32, 2));
		281	const v3: @Vector(4, bool) = [_]bool{ true, false, true, false };
		282	expectEqual(v3, v1 == v2);
		283	expectEqual(v3, v2 == v1);
		284	}
277	}	285	}
278	};	286	};
279	S.doTheTest();	287	S.doTheTest();