mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 00:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

IR: silence irrelevant function prototype errors

Browse Source
This commit is contained in:
Andrew Kelley 2016-11-27 01:45:29 -05:00
parent e5325c7ef3
commit 9e7c475979
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/analyze.cpp
View File

@ -907,14 +907,18 @@ static TypeTableEntry *analyze_fn_proto_type(CodeGen *g, ImportTableEntry *impor
fn_type_id.param_info = allocate_nonzero<FnTypeParamInfo>(fn_type_id.param_count);
fn_type_id.is_var_args = fn_proto->is_var_args;
fn_type_id.return_type = analyze_type_expr(g, import, context, fn_proto->return_type);
for (size_t i = 0; i < fn_type_id.param_count; i += 1) {
AstNode *child = fn_proto->params.at(i);
assert(child->type == NodeTypeParamDecl);
TypeTableEntry *type_entry = analyze_type_expr(g, import, context,
child->data.param_decl.type);
TypeTableEntry *type_entry;
if (fn_proto->skip) {
type_entry = g->builtin_types.entry_invalid;
} else {
type_entry = analyze_type_expr(g, import, context, child->data.param_decl.type);
}
switch (type_entry->id) {
case TypeTableEntryIdInvalid:
fn_proto->skip = true;
@ -927,16 +931,20 @@ static TypeTableEntry *analyze_fn_proto_type(CodeGen *g, ImportTableEntry *impor
case TypeTableEntryIdNamespace:
case TypeTableEntryIdBlock:
case TypeTableEntryIdGenericFn:
fn_proto->skip = true;
add_node_error(g, child->data.param_decl.type,
buf_sprintf("parameter of type '%s' not allowed", buf_ptr(&type_entry->name)));
if (!fn_proto->skip) {
fn_proto->skip = true;
add_node_error(g, child->data.param_decl.type,
buf_sprintf("parameter of type '%s' not allowed", buf_ptr(&type_entry->name)));
}
break;
case TypeTableEntryIdMetaType:
if (!child->data.param_decl.is_inline) {
fn_proto->skip = true;
add_node_error(g, child->data.param_decl.type,
buf_sprintf("parameter of type '%s' must be declared inline",
buf_ptr(&type_entry->name)));
if (!fn_proto->skip) {
fn_proto->skip = true;
add_node_error(g, child->data.param_decl.type,
buf_sprintf("parameter of type '%s' must be declared inline",
buf_ptr(&type_entry->name)));
}
}
break;
case TypeTableEntryIdVoid:
@ -967,6 +975,11 @@ static TypeTableEntry *analyze_fn_proto_type(CodeGen *g, ImportTableEntry *impor
param_info->is_noalias = child->data.param_decl.is_noalias;
}
if (fn_proto->skip) {
fn_type_id.return_type = g->builtin_types.entry_invalid;
} else {
fn_type_id.return_type = analyze_type_expr(g, import, context, fn_proto->return_type);
}
switch (fn_type_id.return_type->id) {
case TypeTableEntryIdInvalid:
fn_proto->skip = true;
@ -979,9 +992,11 @@ static TypeTableEntry *analyze_fn_proto_type(CodeGen *g, ImportTableEntry *impor
case TypeTableEntryIdBlock:
case TypeTableEntryIdGenericFn:
case TypeTableEntryIdVar:
fn_proto->skip = true;
add_node_error(g, fn_proto->return_type,
buf_sprintf("return type '%s' not allowed", buf_ptr(&fn_type_id.return_type->name)));
if (!fn_proto->skip) {
fn_proto->skip = true;
add_node_error(g, fn_proto->return_type,
buf_sprintf("return type '%s' not allowed", buf_ptr(&fn_type_id.return_type->name)));
}
break;
case TypeTableEntryIdMetaType:
case TypeTableEntryIdUnreachable:

8
src/ir.cpp
View File

@ -2523,6 +2523,11 @@ static IrInstruction *ir_lval_wrap(IrBuilder *irb, IrInstruction *value, LValPur
return ir_build_ref(irb, value->source_node, value);
}
static IrInstruction *ir_gen_type_literal(IrBuilder *irb, AstNode *node) {
assert(node->type == NodeTypeTypeLiteral);
return ir_build_const_type(irb, node, irb->codegen->builtin_types.entry_type);
}
static IrInstruction *ir_gen_node_raw(IrBuilder *irb, AstNode *node, BlockContext *block_context,
LValPurpose lval)
{
@ -2580,6 +2585,8 @@ static IrInstruction *ir_gen_node_raw(IrBuilder *irb, AstNode *node, BlockContex
return ir_gen_label(irb, node);
case NodeTypeGoto:
return ir_gen_goto(irb, node);
case NodeTypeTypeLiteral:
return ir_lval_wrap(irb, ir_gen_type_literal(irb, node), lval);
case NodeTypeUnwrapErrorExpr:
case NodeTypeDefer:
case NodeTypeSliceExpr:
@ -2588,7 +2595,6 @@ static IrInstruction *ir_gen_node_raw(IrBuilder *irb, AstNode *node, BlockContex
case NodeTypeCharLiteral:
case NodeTypeZeroesLiteral:
case NodeTypeErrorType:
case NodeTypeTypeLiteral:
case NodeTypeVarLiteral:
case NodeTypeRoot:
case NodeTypeFnProto: