authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-27 16:26:36-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-27 16:26:36-04:00
log2f2215c9f46f0a75ce65803af84984b4a5f3741c
tree2109946b47470eae28c92998321f40565dfc878f
parent526d8425abf91b33e828b964f7d55d70e17780bf
signaturelock-open Commit is signed but in an unrecognized format.

this was intended to be included in the previous commit

1 files changed, 0 insertions(+), 8 deletions(-)

src/analyze.cpp-8
...@@ -1680,14 +1680,6 @@ static TypeTableEntry *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *c...@@ -1680,14 +1680,6 @@ static TypeTableEntry *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *c
1680 case TypeTableEntryIdBlock:1680 case TypeTableEntryIdBlock:
1681 case TypeTableEntryIdBoundFn:1681 case TypeTableEntryIdBoundFn:
1682 case TypeTableEntryIdMetaType:1682 case TypeTableEntryIdMetaType:
1683 if (!calling_convention_allows_zig_types(fn_type_id.cc)) {
1684 add_node_error(g, fn_proto->return_type,
1685 buf_sprintf("return type '%s' not allowed in function with calling convention '%s'",
1686 buf_ptr(&fn_type_id.return_type->name),
1687 calling_convention_name(fn_type_id.cc)));
1688 return g->builtin_types.entry_invalid;
1689 }
1690 return get_generic_fn_type(g, &fn_type_id);
1691 case TypeTableEntryIdUnreachable:1683 case TypeTableEntryIdUnreachable:
1692 case TypeTableEntryIdVoid:1684 case TypeTableEntryIdVoid:
1693 case TypeTableEntryIdBool:1685 case TypeTableEntryIdBool: