Commit cbbcf609688d70ce9e45bde444b2904b39a0ae2c | zig

author	LemonBoy <thatlemon@gmail.com> 2020-09-28 17:16:57+02:00
committer	LemonBoy <thatlemon@gmail.com> 2020-09-28 17:16:57+02:00
log	cbbcf609688d70ce9e45bde444b2904b39a0ae2c
tree	2d691a3896b897a88c99335f1babb5501f04d7eb
parent	56b52dd0a357f87627fe96dc99377a397f3bb9a1

stage1: Allow comparison with comptime-known vectors

Since comptime_{int,float} vectors are not allowed (thanks $DEITY) we
can use the element type infos to determine the minimum operand size.

2 files changed, 12 insertions(+), 10 deletions(-)

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

src/ir.cpp+4-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);

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();