diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-09-29 15:19:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 15:19:09 -0400 |
| commit | 56c5b665a1f93fd16a711986e25e4d7c5dfed163 (patch) | |
| tree | 287b07063d2097ab77361df849c3444caab4383b /src/ir.cpp | |
| parent | a1ae3f92c1cdbae2333d26ad5da224b91e20cb6f (diff) | |
| parent | cbbcf609688d70ce9e45bde444b2904b39a0ae2c (diff) | |
| download | zig-56c5b665a1f93fd16a711986e25e4d7c5dfed163.tar.gz zig-56c5b665a1f93fd16a711986e25e4d7c5dfed163.zip | |
Merge pull request #6448 from LemonBoy/some-vec-fixes
Some vector fixes
Diffstat (limited to 'src/ir.cpp')
| -rw-r--r-- | src/ir.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/ir.cpp b/src/ir.cpp index 7d446c82a0..d8d7289dae 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -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; |