authorgravatar for shawn@git.icuShawn Landden <shawn@git.icu> 2019-05-06 11:41:15-05:00
committergravatar for shawn@git.icuShawn Landden <shawn@git.icu> 2019-05-06 11:52:47-05:00
logc19bdc2d370f3a72ef492e2f4e6264e2a0dd91ec
tree26c14f9b6b1b0edaee401842a7fe3af34a462ee8
parent7a41af2632e693cd63476576bbbb965126e45b9b

stage1: add @hasField() built-in

This was quite straight-forward Closes: #1439

5 files changed, 94 insertions(+), 0 deletions(-)

src/all_types.hpp+10
...@@ -1394,6 +1394,7 @@ enum BuiltinFnId {...@@ -1394,6 +1394,7 @@ enum BuiltinFnId {
1394 BuiltinFnIdMemberName,1394 BuiltinFnIdMemberName,
1395 BuiltinFnIdField,1395 BuiltinFnIdField,
1396 BuiltinFnIdTypeInfo,1396 BuiltinFnIdTypeInfo,
1397 BuiltinFnIdHasField,
1397 BuiltinFnIdTypeof,1398 BuiltinFnIdTypeof,
1398 BuiltinFnIdAddWithOverflow,1399 BuiltinFnIdAddWithOverflow,
1399 BuiltinFnIdSubWithOverflow,1400 BuiltinFnIdSubWithOverflow,
...@@ -2251,6 +2252,7 @@ enum IrInstructionId {...@@ -2251,6 +2252,7 @@ enum IrInstructionId {
2251 IrInstructionIdByteOffsetOf,2252 IrInstructionIdByteOffsetOf,
2252 IrInstructionIdBitOffsetOf,2253 IrInstructionIdBitOffsetOf,
2253 IrInstructionIdTypeInfo,2254 IrInstructionIdTypeInfo,
2255 IrInstructionIdHasField,
2254 IrInstructionIdTypeId,2256 IrInstructionIdTypeId,
2255 IrInstructionIdSetEvalBranchQuota,2257 IrInstructionIdSetEvalBranchQuota,
2256 IrInstructionIdPtrType,2258 IrInstructionIdPtrType,
...@@ -3229,6 +3231,14 @@ struct IrInstructionTypeInfo {...@@ -3229,6 +3231,14 @@ struct IrInstructionTypeInfo {
3229 IrInstruction *type_value;3231 IrInstruction *type_value;
3230};3232};
32313233
3234struct IrInstructionHasField {
3235 IrInstruction base;
3236
3237 IrInstruction *container_type;
3238 Buf *field_name_buffer;
3239 IrInstruction *field_name_expr;
3240};
3241
3232struct IrInstructionTypeId {3242struct IrInstructionTypeId {
3233 IrInstruction base;3243 IrInstruction base;
32343244
src/codegen.cpp+2
...@@ -5530,6 +5530,7 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,...@@ -5530,6 +5530,7 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,
5530 case IrInstructionIdByteOffsetOf:5530 case IrInstructionIdByteOffsetOf:
5531 case IrInstructionIdBitOffsetOf:5531 case IrInstructionIdBitOffsetOf:
5532 case IrInstructionIdTypeInfo:5532 case IrInstructionIdTypeInfo:
5533 case IrInstructionIdHasField:
5533 case IrInstructionIdTypeId:5534 case IrInstructionIdTypeId:
5534 case IrInstructionIdSetEvalBranchQuota:5535 case IrInstructionIdSetEvalBranchQuota:
5535 case IrInstructionIdPtrType:5536 case IrInstructionIdPtrType:
...@@ -7271,6 +7272,7 @@ static void define_builtin_fns(CodeGen *g) {...@@ -7271,6 +7272,7 @@ static void define_builtin_fns(CodeGen *g) {
7271 create_builtin_fn(g, BuiltinFnIdMemberName, "memberName", 2);7272 create_builtin_fn(g, BuiltinFnIdMemberName, "memberName", 2);
7272 create_builtin_fn(g, BuiltinFnIdField, "field", 2);7273 create_builtin_fn(g, BuiltinFnIdField, "field", 2);
7273 create_builtin_fn(g, BuiltinFnIdTypeInfo, "typeInfo", 1);7274 create_builtin_fn(g, BuiltinFnIdTypeInfo, "typeInfo", 1);
7275 create_builtin_fn(g, BuiltinFnIdHasField, "hasField", 2);
7274 create_builtin_fn(g, BuiltinFnIdTypeof, "typeOf", 1); // TODO rename to TypeOf7276 create_builtin_fn(g, BuiltinFnIdTypeof, "typeOf", 1); // TODO rename to TypeOf
7275 create_builtin_fn(g, BuiltinFnIdAddWithOverflow, "addWithOverflow", 4);7277 create_builtin_fn(g, BuiltinFnIdAddWithOverflow, "addWithOverflow", 4);
7276 create_builtin_fn(g, BuiltinFnIdSubWithOverflow, "subWithOverflow", 4);7278 create_builtin_fn(g, BuiltinFnIdSubWithOverflow, "subWithOverflow", 4);
src/ir.cpp+70
...@@ -851,6 +851,10 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionTypeInfo *) {...@@ -851,6 +851,10 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionTypeInfo *) {
851 return IrInstructionIdTypeInfo;851 return IrInstructionIdTypeInfo;
852}852}
853853
854static constexpr IrInstructionId ir_instruction_id(IrInstructionHasField *) {
855 return IrInstructionIdHasField;
856}
857
854static constexpr IrInstructionId ir_instruction_id(IrInstructionTypeId *) {858static constexpr IrInstructionId ir_instruction_id(IrInstructionTypeId *) {
855 return IrInstructionIdTypeId;859 return IrInstructionIdTypeId;
856}860}
...@@ -1280,6 +1284,20 @@ static IrInstruction *ir_build_field_ptr(IrBuilder *irb, Scope *scope, AstNode *...@@ -1280,6 +1284,20 @@ static IrInstruction *ir_build_field_ptr(IrBuilder *irb, Scope *scope, AstNode *
1280 return &instruction->base;1284 return &instruction->base;
1281}1285}
12821286
1287static IrInstruction *ir_build_has_field(IrBuilder *irb, Scope *scope, AstNode *source_node,
1288 IrInstruction *container_type, IrInstruction *field_name_expr)
1289{
1290 IrInstructionHasField *instruction = ir_build_instruction<IrInstructionHasField>(irb, scope, source_node);
1291 instruction->container_type = container_type;
1292 instruction->field_name_buffer = nullptr;
1293 instruction->field_name_expr = field_name_expr;
1294
1295 ir_ref_instruction(container_type, irb->current_basic_block);
1296 ir_ref_instruction(field_name_expr, irb->current_basic_block);
1297
1298 return &instruction->base;
1299}
1300
1283static IrInstruction *ir_build_struct_field_ptr(IrBuilder *irb, Scope *scope, AstNode *source_node,1301static IrInstruction *ir_build_struct_field_ptr(IrBuilder *irb, Scope *scope, AstNode *source_node,
1284 IrInstruction *struct_ptr, TypeStructField *field)1302 IrInstruction *struct_ptr, TypeStructField *field)
1285{1303{
...@@ -4598,6 +4616,21 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo...@@ -4598,6 +4616,21 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
45984616
4599 return ir_build_load_ptr(irb, scope, node, ptr_instruction);4617 return ir_build_load_ptr(irb, scope, node, ptr_instruction);
4600 }4618 }
4619 case BuiltinFnIdHasField:
4620 {
4621 AstNode *arg0_node = node->data.fn_call_expr.params.at(0);
4622 IrInstruction *arg0_value = ir_gen_node(irb, arg0_node, scope);
4623 if (arg0_value == irb->codegen->invalid_instruction)
4624 return arg0_value;
4625
4626 AstNode *arg1_node = node->data.fn_call_expr.params.at(1);
4627 IrInstruction *arg1_value = ir_gen_node(irb, arg1_node, scope);
4628 if (arg1_value == irb->codegen->invalid_instruction)
4629 return arg1_value;
4630
4631 IrInstruction *type_info = ir_build_has_field(irb, scope, node, arg0_value, arg1_value);
4632 return ir_lval_wrap(irb, scope, type_info, lval);
4633 }
4601 case BuiltinFnIdTypeInfo:4634 case BuiltinFnIdTypeInfo:
4602 {4635 {
4603 AstNode *arg0_node = node->data.fn_call_expr.params.at(0);4636 AstNode *arg0_node = node->data.fn_call_expr.params.at(0);
...@@ -20578,6 +20611,40 @@ static IrInstruction *ir_analyze_instruction_member_name(IrAnalyze *ira, IrInstr...@@ -20578,6 +20611,40 @@ static IrInstruction *ir_analyze_instruction_member_name(IrAnalyze *ira, IrInstr
20578 }20611 }
20579}20612}
2058020613
20614static IrInstruction *ir_analyze_instruction_has_field(IrAnalyze *ira, IrInstructionHasField *instruction) {
20615 Error err;
20616 IrInstruction *container_type_value = instruction->container_type->child;
20617 ZigType *container_type = ir_resolve_type(ira, container_type_value);
20618 if (type_is_invalid(container_type))
20619 return ira->codegen->invalid_instruction;
20620
20621 if ((err = ensure_complete_type(ira->codegen, container_type)))
20622 return ira->codegen->invalid_instruction;
20623
20624 Buf *field_name = instruction->field_name_buffer;
20625 if (!field_name) {
20626 IrInstruction *field_name_expr = instruction->field_name_expr->child;
20627 field_name = ir_resolve_str(ira, field_name_expr);
20628 if (!field_name)
20629 return ira->codegen->invalid_instruction;
20630 }
20631
20632 bool result;
20633 if (container_type->id == ZigTypeIdStruct)
20634 result = (bool)find_struct_type_field(container_type, field_name);
20635 else if (container_type->id == ZigTypeIdEnum)
20636 result = (bool)find_enum_type_field(container_type, field_name);
20637 else if (container_type->id == ZigTypeIdUnion)
20638 result = (bool)find_union_type_field(container_type, field_name);
20639 else {
20640 ir_add_error(ira, container_type_value,
20641 buf_sprintf("type '%s' does not support @memberName", buf_ptr(&container_type->name)));
20642 return ira->codegen->invalid_instruction;
20643 }
20644 return ir_build_const_bool(&ira->new_irb,
20645 instruction->base.scope, instruction->base.source_node, result);
20646}
20647
20581static IrInstruction *ir_analyze_instruction_breakpoint(IrAnalyze *ira, IrInstructionBreakpoint *instruction) {20648static IrInstruction *ir_analyze_instruction_breakpoint(IrAnalyze *ira, IrInstructionBreakpoint *instruction) {
20582 IrInstruction *result = ir_build_breakpoint(&ira->new_irb,20649 IrInstruction *result = ir_build_breakpoint(&ira->new_irb,
20583 instruction->base.scope, instruction->base.source_node);20650 instruction->base.scope, instruction->base.source_node);
...@@ -23068,6 +23135,8 @@ static IrInstruction *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstructio...@@ -23068,6 +23135,8 @@ static IrInstruction *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstructio
23068 return ir_analyze_instruction_bit_offset_of(ira, (IrInstructionBitOffsetOf *)instruction);23135 return ir_analyze_instruction_bit_offset_of(ira, (IrInstructionBitOffsetOf *)instruction);
23069 case IrInstructionIdTypeInfo:23136 case IrInstructionIdTypeInfo:
23070 return ir_analyze_instruction_type_info(ira, (IrInstructionTypeInfo *) instruction);23137 return ir_analyze_instruction_type_info(ira, (IrInstructionTypeInfo *) instruction);
23138 case IrInstructionIdHasField:
23139 return ir_analyze_instruction_has_field(ira, (IrInstructionHasField *) instruction);
23071 case IrInstructionIdTypeId:23140 case IrInstructionIdTypeId:
23072 return ir_analyze_instruction_type_id(ira, (IrInstructionTypeId *)instruction);23141 return ir_analyze_instruction_type_id(ira, (IrInstructionTypeId *)instruction);
23073 case IrInstructionIdSetEvalBranchQuota:23142 case IrInstructionIdSetEvalBranchQuota:
...@@ -23355,6 +23424,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {...@@ -23355,6 +23424,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {
23355 case IrInstructionIdByteOffsetOf:23424 case IrInstructionIdByteOffsetOf:
23356 case IrInstructionIdBitOffsetOf:23425 case IrInstructionIdBitOffsetOf:
23357 case IrInstructionIdTypeInfo:23426 case IrInstructionIdTypeInfo:
23427 case IrInstructionIdHasField:
23358 case IrInstructionIdTypeId:23428 case IrInstructionIdTypeId:
23359 case IrInstructionIdAlignCast:23429 case IrInstructionIdAlignCast:
23360 case IrInstructionIdOpaqueType:23430 case IrInstructionIdOpaqueType:
src/ir_print.cpp+11
...@@ -1107,6 +1107,14 @@ static void ir_print_type_info(IrPrint *irp, IrInstructionTypeInfo *instruction)...@@ -1107,6 +1107,14 @@ static void ir_print_type_info(IrPrint *irp, IrInstructionTypeInfo *instruction)
1107 fprintf(irp->f, ")");1107 fprintf(irp->f, ")");
1108}1108}
11091109
1110static void ir_print_has_field(IrPrint *irp, IrInstructionHasField *instruction) {
1111 fprintf(irp->f, "@hasField(");
1112 ir_print_other_instruction(irp, instruction->container_type);
1113 fprintf(irp->f, ",");
1114 ir_print_other_instruction(irp, instruction->field_name_expr);
1115 fprintf(irp->f, ")");
1116}
1117
1110static void ir_print_type_id(IrPrint *irp, IrInstructionTypeId *instruction) {1118static void ir_print_type_id(IrPrint *irp, IrInstructionTypeId *instruction) {
1111 fprintf(irp->f, "@typeId(");1119 fprintf(irp->f, "@typeId(");
1112 ir_print_other_instruction(irp, instruction->type_value);1120 ir_print_other_instruction(irp, instruction->type_value);
...@@ -1757,6 +1765,9 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {...@@ -1757,6 +1765,9 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
1757 case IrInstructionIdTypeInfo:1765 case IrInstructionIdTypeInfo:
1758 ir_print_type_info(irp, (IrInstructionTypeInfo *)instruction);1766 ir_print_type_info(irp, (IrInstructionTypeInfo *)instruction);
1759 break;1767 break;
1768 case IrInstructionIdHasField:
1769 ir_print_has_field(irp, (IrInstructionHasField *)instruction);
1770 break;
1760 case IrInstructionIdTypeId:1771 case IrInstructionIdTypeId:
1761 ir_print_type_id(irp, (IrInstructionTypeId *)instruction);1772 ir_print_type_id(irp, (IrInstructionTypeId *)instruction);
1762 break;1773 break;
test/stage1/behavior.zig+1
...@@ -94,4 +94,5 @@ comptime {...@@ -94,4 +94,5 @@ comptime {
94 _ = @import("behavior/void.zig");94 _ = @import("behavior/void.zig");
95 _ = @import("behavior/while.zig");95 _ = @import("behavior/while.zig");
96 _ = @import("behavior/widening.zig");96 _ = @import("behavior/widening.zig");
97 _ = @import("behavior/hasfield.zig");
97}98}