authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-06 15:23:05-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-06 15:23:05-05:00
log5951b79af40212754071157596b8aebbe2414ffb
tree9e2377dddfec47701210dd4135d0c0f1de12926d
parent0a9daeb37e997ff75dcd16d1fc3b4cc143314e85
signature Commit is signed but in an unrecognized format.

remove stdcallcc, extern, nakedcc from stage1; zig fmt rewrites

10 files changed, 31 insertions(+), 52 deletions(-)

lib/std/builtin.zig-1
......@@ -322,7 +322,6 @@ pub const TypeInfo = union(enum) {
322322 pub const FnDecl = struct {
323323 fn_type: type,
324324 inline_type: Inline,
325 calling_convention: CallingConvention,
326325 is_var_args: bool,
327326 is_extern: bool,
328327 is_export: bool,
lib/std/zig/parser_test.zig+3-1
......@@ -10,13 +10,15 @@ test "zig fmt: change @typeOf to @TypeOf" {
1010}
1111
1212// TODO: Remove nakedcc/stdcallcc once zig 0.6.0 is released. See https://github.com/ziglang/zig/pull/3977
13test "zig fmt: convert nakedcc/stdcallcc into callconv(...)" {
13test "zig fmt: convert extern/nakedcc/stdcallcc into callconv(...)" {
1414 try testTransform(
1515 \\nakedcc fn foo1() void {}
1616 \\stdcallcc fn foo2() void {}
17 \\extern fn foo3() void {}
1718 ,
1819 \\fn foo1() callconv(.Naked) void {}
1920 \\fn foo2() callconv(.Stdcall) void {}
21 \\fn foo3() callconv(.C) void {}
2022 \\
2123 );
2224}
lib/std/zig/render.zig+10-5
......@@ -1311,17 +1311,22 @@ fn renderExpression(
13111311 try renderToken(tree, stream, visib_token_index, indent, start_col, Space.Space); // pub
13121312 }
13131313
1314 // Some extra machinery is needed to rewrite the old-style cc
1315 // notation to the new callconv one
1316 var cc_rewrite_str: ?[*:0]const u8 = null;
13141317 if (fn_proto.extern_export_inline_token) |extern_export_inline_token| {
1315 try renderToken(tree, stream, extern_export_inline_token, indent, start_col, Space.Space); // extern/export
1318 const tok = tree.tokens.at(extern_export_inline_token);
1319 if (tok.id != .Keyword_extern or fn_proto.body_node == null) {
1320 try renderToken(tree, stream, extern_export_inline_token, indent, start_col, Space.Space); // extern/export
1321 } else {
1322 cc_rewrite_str = ".C";
1323 }
13161324 }
13171325
13181326 if (fn_proto.lib_name) |lib_name| {
13191327 try renderExpression(allocator, stream, tree, indent, start_col, lib_name, Space.Space);
13201328 }
13211329
1322 // Some extra machinery is needed to rewrite the old-style cc
1323 // notation to the new callconv one
1324 var cc_rewrite_str: ?[*:0]const u8 = null;
13251330 if (fn_proto.cc_token) |cc_token| {
13261331 var str = tree.tokenSlicePtr(tree.tokens.at(cc_token));
13271332 if (mem.eql(u8, str, "stdcallcc")) {
......@@ -1405,7 +1410,7 @@ fn renderExpression(
14051410 const callconv_lparen = tree.prevToken(callconv_expr.firstToken());
14061411 const callconv_kw = tree.prevToken(callconv_lparen);
14071412
1408 try renderToken(tree, stream, callconv_kw, indent, start_col, Space.None); // section
1413 try renderToken(tree, stream, callconv_kw, indent, start_col, Space.None); // callconv
14091414 try renderToken(tree, stream, callconv_lparen, indent, start_col, Space.None); // (
14101415 try renderExpression(allocator, stream, tree, indent, start_col, callconv_expr, Space.None);
14111416 try renderToken(tree, stream, callconv_rparen, indent, start_col, Space.Space); // )
src/all_types.hpp-3
......@@ -653,8 +653,6 @@ struct AstNodeFnProto {
653653 Buf doc_comments;
654654
655655 FnInline fn_inline;
656 bool is_nakedcc;
657 bool is_stdcallcc;
658656 bool is_async;
659657
660658 VisibMod visib_mod;
......@@ -1610,7 +1608,6 @@ struct ZigFn {
16101608 Buf **param_names;
16111609 IrInstruction *err_code_spill;
16121610 AstNode *assumed_non_async;
1613 CallingConvention cc;
16141611
16151612 AstNode *fn_no_inline_set_node;
16161613 AstNode *fn_static_eval_set_node;
src/analyze.cpp+10-12
......@@ -1451,8 +1451,6 @@ ZigType *analyze_type_expr(CodeGen *g, Scope *scope, AstNode *node) {
14511451ZigType *get_generic_fn_type(CodeGen *g, FnTypeId *fn_type_id) {
14521452 ZigType *fn_type = new_type_table_entry(ZigTypeIdFn);
14531453 buf_resize(&fn_type->name, 0);
1454 if (fn_type->data.fn.fn_type_id.cc == CallingConventionC)
1455 buf_append_str(&fn_type->name, "extern ");
14561454 buf_appendf(&fn_type->name, "fn(");
14571455 size_t i = 0;
14581456 for (; i < fn_type_id->next_param_index; i += 1) {
......@@ -1465,7 +1463,7 @@ ZigType *get_generic_fn_type(CodeGen *g, FnTypeId *fn_type_id) {
14651463 buf_appendf(&fn_type->name, "%svar", comma_str);
14661464 }
14671465 buf_append_str(&fn_type->name, ")");
1468 if (fn_type_id->cc != CallingConventionUnspecified && fn_type_id->cc != CallingConventionC) {
1466 if (fn_type_id->cc != CallingConventionUnspecified) {
14691467 buf_appendf(&fn_type->name, " callconv(%s)", calling_convention_name(fn_type_id->cc));
14701468 }
14711469 buf_append_str(&fn_type->name, " var");
......@@ -1479,10 +1477,6 @@ ZigType *get_generic_fn_type(CodeGen *g, FnTypeId *fn_type_id) {
14791477}
14801478
14811479CallingConvention cc_from_fn_proto(AstNodeFnProto *fn_proto) {
1482 if (fn_proto->is_nakedcc)
1483 return CallingConventionNaked;
1484 if (fn_proto->is_stdcallcc)
1485 return CallingConventionStdcall;
14861480 if (fn_proto->is_async)
14871481 return CallingConventionAsync;
14881482 // Compatible with the C ABI
......@@ -1764,13 +1758,15 @@ ZigType *get_auto_err_set_type(CodeGen *g, ZigFn *fn_entry) {
17641758 return err_set_type;
17651759}
17661760
1767static ZigType *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *child_scope, ZigFn *fn_entry) {
1761static ZigType *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *child_scope, ZigFn *fn_entry,
1762 CallingConvention cc)
1763{
17681764 assert(proto_node->type == NodeTypeFnProto);
17691765 AstNodeFnProto *fn_proto = &proto_node->data.fn_proto;
17701766 Error err;
17711767
17721768 FnTypeId fn_type_id = {0};
1773 init_fn_type_id(&fn_type_id, proto_node, fn_entry->cc, proto_node->data.fn_proto.params.length);
1769 init_fn_type_id(&fn_type_id, proto_node, cc, proto_node->data.fn_proto.params.length);
17741770
17751771 for (; fn_type_id.next_param_index < fn_type_id.param_count; fn_type_id.next_param_index += 1) {
17761772 AstNode *param_node = fn_proto->params.at(fn_type_id.next_param_index);
......@@ -3432,7 +3428,7 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
34323428
34333429 Scope *child_scope = fn_table_entry->fndef_scope ? &fn_table_entry->fndef_scope->base : tld_fn->base.parent_scope;
34343430
3435 fn_table_entry->cc = cc_from_fn_proto(fn_proto);
3431 CallingConvention cc;
34363432 if (fn_proto->callconv_expr != nullptr) {
34373433 ZigType *cc_enum_value = get_builtin_type(g, "CallingConvention");
34383434
......@@ -3444,7 +3440,9 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
34443440 return;
34453441 }
34463442
3447 fn_table_entry->cc = (CallingConvention)bigint_as_u32(&result_val->data.x_enum_tag);
3443 cc = (CallingConvention)bigint_as_u32(&result_val->data.x_enum_tag);
3444 } else {
3445 cc = cc_from_fn_proto(fn_proto);
34483446 }
34493447
34503448 if (fn_proto->section_expr != nullptr) {
......@@ -3455,7 +3453,7 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
34553453 }
34563454 }
34573455
3458 fn_table_entry->type_entry = analyze_fn_type(g, source_node, child_scope, fn_table_entry);
3456 fn_table_entry->type_entry = analyze_fn_type(g, source_node, child_scope, fn_table_entry, cc);
34593457
34603458 if (type_is_invalid(fn_table_entry->type_entry)) {
34613459 tld_fn->base.resolution = TldResolutionInvalid;
src/codegen.cpp+1-1
......@@ -519,7 +519,7 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {
519519 if (cc == CallingConventionNaked) {
520520 addLLVMFnAttr(llvm_fn, "naked");
521521 } else {
522 ZigLLVMFunctionSetCallingConv(llvm_fn, get_llvm_cc(g, fn_type->data.fn.fn_type_id.cc));
522 ZigLLVMFunctionSetCallingConv(llvm_fn, get_llvm_cc(g, cc));
523523 }
524524
525525 bool want_cold = fn->is_cold || cc == CallingConventionCold;
src/ir.cpp+6-12
......@@ -18263,7 +18263,6 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstruction *source_i
1826318263 buf_init_from_buf(&impl_fn->symbol_name, &fn_entry->symbol_name);
1826418264 impl_fn->fndef_scope = create_fndef_scope(ira->codegen, impl_fn->body_node, parent_scope, impl_fn);
1826518265 impl_fn->child_scope = &impl_fn->fndef_scope->base;
18266 impl_fn->cc = fn_entry->cc;
1826718266 FnTypeId inst_fn_type_id = {0};
1826818267 init_fn_type_id(&inst_fn_type_id, fn_proto_node, fn_type_id->cc, new_fn_arg_count);
1826918268 inst_fn_type_id.param_count = 0;
......@@ -22599,29 +22598,24 @@ static Error ir_make_type_info_decls(IrAnalyze *ira, IrInstruction *source_instr
2259922598 fn_decl_fields[1]->special = ConstValSpecialStatic;
2260022599 fn_decl_fields[1]->type = type_info_fn_decl_inline_type;
2260122600 bigint_init_unsigned(&fn_decl_fields[1]->data.x_enum_tag, fn_entry->fn_inline);
22602 // calling_convention: TypeInfo.CallingConvention
22603 ensure_field_index(fn_decl_val->type, "calling_convention", 2);
22604 fn_decl_fields[2]->special = ConstValSpecialStatic;
22605 fn_decl_fields[2]->type = get_builtin_type(ira->codegen, "CallingConvention");
22606 bigint_init_unsigned(&fn_decl_fields[2]->data.x_enum_tag, fn_entry->cc);
2260722601 // is_var_args: bool
22608 ensure_field_index(fn_decl_val->type, "is_var_args", 3);
22602 ensure_field_index(fn_decl_val->type, "is_var_args", 2);
2260922603 bool is_varargs = fn_node->is_var_args;
2261022604 fn_decl_fields[3]->special = ConstValSpecialStatic;
2261122605 fn_decl_fields[3]->type = ira->codegen->builtin_types.entry_bool;
2261222606 fn_decl_fields[3]->data.x_bool = is_varargs;
2261322607 // is_extern: bool
22614 ensure_field_index(fn_decl_val->type, "is_extern", 4);
22608 ensure_field_index(fn_decl_val->type, "is_extern", 3);
2261522609 fn_decl_fields[4]->special = ConstValSpecialStatic;
2261622610 fn_decl_fields[4]->type = ira->codegen->builtin_types.entry_bool;
2261722611 fn_decl_fields[4]->data.x_bool = fn_node->is_extern;
2261822612 // is_export: bool
22619 ensure_field_index(fn_decl_val->type, "is_export", 5);
22613 ensure_field_index(fn_decl_val->type, "is_export", 4);
2262022614 fn_decl_fields[5]->special = ConstValSpecialStatic;
2262122615 fn_decl_fields[5]->type = ira->codegen->builtin_types.entry_bool;
2262222616 fn_decl_fields[5]->data.x_bool = fn_node->is_export;
2262322617 // lib_name: ?[]const u8
22624 ensure_field_index(fn_decl_val->type, "lib_name", 6);
22618 ensure_field_index(fn_decl_val->type, "lib_name", 5);
2262522619 fn_decl_fields[6]->special = ConstValSpecialStatic;
2262622620 ZigType *u8_ptr = get_pointer_to_type_extra(
2262722621 ira->codegen, ira->codegen->builtin_types.entry_u8,
......@@ -22637,12 +22631,12 @@ static Error ir_make_type_info_decls(IrAnalyze *ira, IrInstruction *source_instr
2263722631 fn_decl_fields[6]->data.x_optional = nullptr;
2263822632 }
2263922633 // return_type: type
22640 ensure_field_index(fn_decl_val->type, "return_type", 7);
22634 ensure_field_index(fn_decl_val->type, "return_type", 6);
2264122635 fn_decl_fields[7]->special = ConstValSpecialStatic;
2264222636 fn_decl_fields[7]->type = ira->codegen->builtin_types.entry_type;
2264322637 fn_decl_fields[7]->data.x_type = fn_entry->type_entry->data.fn.fn_type_id.return_type;
2264422638 // arg_names: [][] const u8
22645 ensure_field_index(fn_decl_val->type, "arg_names", 8);
22639 ensure_field_index(fn_decl_val->type, "arg_names", 7);
2264622640 size_t fn_arg_count = fn_entry->variable_list.length;
2264722641 ZigValue *fn_arg_name_array = create_const_vals(1);
2264822642 fn_arg_name_array->special = ConstValSpecialStatic;
src/parser.cpp+1-11
......@@ -2117,20 +2117,10 @@ static AstNode *ast_parse_callconv(ParseContext *pc) {
21172117}
21182118
21192119// FnCC
2120// <- KEYWORD_nakedcc
2121// / KEYWORD_stdcallcc
2122// / KEYWORD_extern
2120// <- KEYWORD_extern
21232121// / KEYWORD_async
21242122static Optional<AstNodeFnProto> ast_parse_fn_cc(ParseContext *pc) {
21252123 AstNodeFnProto res = {};
2126 if (eat_token_if(pc, TokenIdKeywordNakedCC) != nullptr) {
2127 res.is_nakedcc = true;
2128 return Optional<AstNodeFnProto>::some(res);
2129 }
2130 if (eat_token_if(pc, TokenIdKeywordStdcallCC) != nullptr) {
2131 res.is_stdcallcc = true;
2132 return Optional<AstNodeFnProto>::some(res);
2133 }
21342124 if (eat_token_if(pc, TokenIdKeywordAsync) != nullptr) {
21352125 res.is_async = true;
21362126 return Optional<AstNodeFnProto>::some(res);
src/tokenizer.cpp-4
......@@ -127,7 +127,6 @@ static const struct ZigKeyword zig_keywords[] = {
127127 {"for", TokenIdKeywordFor},
128128 {"if", TokenIdKeywordIf},
129129 {"inline", TokenIdKeywordInline},
130 {"nakedcc", TokenIdKeywordNakedCC},
131130 {"noalias", TokenIdKeywordNoAlias},
132131 {"noasync", TokenIdKeywordNoAsync},
133132 {"noinline", TokenIdKeywordNoInline},
......@@ -139,7 +138,6 @@ static const struct ZigKeyword zig_keywords[] = {
139138 {"resume", TokenIdKeywordResume},
140139 {"return", TokenIdKeywordReturn},
141140 {"linksection", TokenIdKeywordLinkSection},
142 {"stdcallcc", TokenIdKeywordStdcallCC},
143141 {"struct", TokenIdKeywordStruct},
144142 {"suspend", TokenIdKeywordSuspend},
145143 {"switch", TokenIdKeywordSwitch},
......@@ -1562,7 +1560,6 @@ const char * token_name(TokenId id) {
15621560 case TokenIdKeywordFor: return "for";
15631561 case TokenIdKeywordIf: return "if";
15641562 case TokenIdKeywordInline: return "inline";
1565 case TokenIdKeywordNakedCC: return "nakedcc";
15661563 case TokenIdKeywordNoAlias: return "noalias";
15671564 case TokenIdKeywordNoAsync: return "noasync";
15681565 case TokenIdKeywordNoInline: return "noinline";
......@@ -1573,7 +1570,6 @@ const char * token_name(TokenId id) {
15731570 case TokenIdKeywordPub: return "pub";
15741571 case TokenIdKeywordReturn: return "return";
15751572 case TokenIdKeywordLinkSection: return "linksection";
1576 case TokenIdKeywordStdcallCC: return "stdcallcc";
15771573 case TokenIdKeywordStruct: return "struct";
15781574 case TokenIdKeywordSwitch: return "switch";
15791575 case TokenIdKeywordTest: return "test";
src/tokenizer.hpp-2
......@@ -77,7 +77,6 @@ enum TokenId {
7777 TokenIdKeywordInline,
7878 TokenIdKeywordNoInline,
7979 TokenIdKeywordLinkSection,
80 TokenIdKeywordNakedCC,
8180 TokenIdKeywordNoAlias,
8281 TokenIdKeywordNoAsync,
8382 TokenIdKeywordNull,
......@@ -87,7 +86,6 @@ enum TokenId {
8786 TokenIdKeywordPub,
8887 TokenIdKeywordResume,
8988 TokenIdKeywordReturn,
90 TokenIdKeywordStdcallCC,
9189 TokenIdKeywordStruct,
9290 TokenIdKeywordSuspend,
9391 TokenIdKeywordSwitch,