Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IR: fix errorName builtin

Browse Source
This commit is contained in:
Andrew Kelley 2016-12-10 17:11:35 -05:00
parent 0ab953acb2
commit 443e14afbd
3 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/all_types.hpp
View File

@ -1232,6 +1232,9 @@ struct ErrorTableEntry {
Buf name;
uint32_t value;
AstNode *decl_node;
// If we generate a constant error name value for this error, we memoize it here.
// The type of this is array
ConstExprValue *cached_error_name_val;
};
struct LabelTableEntry {

41
src/ir.cpp
View File

@ -512,12 +512,7 @@ static IrInstruction *ir_build_const_bound_fn(IrBuilder *irb, Scope *scope, AstN
return &const_instruction->base;
}
static IrInstruction *ir_create_const_str_lit(IrBuilder *irb, Scope *scope, AstNode *source_node, Buf *str) {
IrInstructionConst *const_instruction = ir_create_instruction<IrInstructionConst>(irb->exec, scope, source_node);
TypeTableEntry *u8_type = irb->codegen->builtin_types.entry_u8;
TypeTableEntry *type_entry = get_array_type(irb->codegen, u8_type, buf_len(str));
const_instruction->base.type_entry = type_entry;
ConstExprValue *const_val = &const_instruction->base.static_value;
static void init_const_str_lit(ConstExprValue *const_val, Buf *str) {
const_val->special = ConstValSpecialStatic;
const_val->data.x_array.elements = allocate<ConstExprValue>(buf_len(str));
const_val->data.x_array.size = buf_len(str);
@ -527,6 +522,15 @@ static IrInstruction *ir_create_const_str_lit(IrBuilder *irb, Scope *scope, AstN
this_char->special = ConstValSpecialStatic;
bignum_init_unsigned(&this_char->data.x_bignum, buf_ptr(str)[i]);
}
}
static IrInstruction *ir_create_const_str_lit(IrBuilder *irb, Scope *scope, AstNode *source_node, Buf *str) {
IrInstructionConst *const_instruction = ir_create_instruction<IrInstructionConst>(irb->exec, scope, source_node);
TypeTableEntry *u8_type = irb->codegen->builtin_types.entry_u8;
TypeTableEntry *type_entry = get_array_type(irb->codegen, u8_type, buf_len(str));
const_instruction->base.type_entry = type_entry;
ConstExprValue *const_val = &const_instruction->base.static_value;
init_const_str_lit(const_val, str);
return &const_instruction->base;
}
@ -6877,11 +6881,26 @@ static TypeTableEntry *ir_analyze_instruction_err_name(IrAnalyze *ira, IrInstruc
TypeTableEntry *str_type = get_slice_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true);
if (casted_value->static_value.special == ConstValSpecialStatic) {
ErrorTableEntry *err = casted_value->static_value.data.x_pure_err;
IrInstruction *new_instruction = ir_create_const_str_lit(&ira->new_irb, instruction->base.scope,
instruction->base.source_node, &err->name);
ir_link_new_instruction(new_instruction, &instruction->base);
new_instruction->static_value.special = ConstValSpecialStatic;
new_instruction->static_value.depends_on_compile_var = casted_value->static_value.depends_on_compile_var;
if (!err->cached_error_name_val) {
err->cached_error_name_val = allocate<ConstExprValue>(1);
err->cached_error_name_val->special = ConstValSpecialStatic;
err->cached_error_name_val->data.x_struct.fields = allocate<ConstExprValue>(2);
ConstExprValue *array_val = allocate<ConstExprValue>(1);
init_const_str_lit(array_val, &err->name);
ConstExprValue *ptr_val = &err->cached_error_name_val->data.x_struct.fields[slice_ptr_index];
ptr_val->special = ConstValSpecialStatic;
ptr_val->data.x_ptr.base_ptr = array_val;
ptr_val->data.x_ptr.index = 0;
ConstExprValue *len_val = &err->cached_error_name_val->data.x_struct.fields[slice_len_index];
len_val->special = ConstValSpecialStatic;
bignum_init_unsigned(&len_val->data.x_bignum, buf_len(&err->name));
}
ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base,
casted_value->static_value.depends_on_compile_var);
*out_val = *err->cached_error_name_val;
return str_type;
}

10
test/self_hosted2.zig
View File

@ -258,6 +258,15 @@ pub fn sliceEql(inline T: type, a: []const T, b: []const T) -> bool {
return true;
}
error ItBroke;
fn gimmeItBroke() -> []const u8 {
@errorName(error.ItBroke)
}
fn testErrorName() {
assert(memeql(@errorName(error.ItBroke), "ItBroke"));
}
fn assert(ok: bool) {
if (!ok)
@unreachable();
@ -284,6 +293,7 @@ fn runAllTests() {
testInlineVarsAgain();
testMinValueAndMaxValue();
testReturnStringFromFunction();
testErrorName();
}
export nakedcc fn _start() -> unreachable {