mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-18 04:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: implement function body analysis

Browse Source 
now with whole-file-astgen
This commit is contained in:
Andrew Kelley 2021-04-30 23:11:20 -07:00
parent 077b8d3def
commit 351b57497b
2 changed files with 66 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/Module.zig
View File

@ -3986,48 +3986,44 @@ pub fn analyzeFnBody(mod: *Module, decl: *Decl, func: *Fn) !void {
param_inst.* = &arg_inst.base; param_inst.* = &arg_inst.base;
} }
var f = false; const zir = decl.namespace.file_scope.zir;
if (f) {
return error.AnalysisFail;
}
@panic("TODO reimplement analyzeFnBody now that ZIR is whole-file");
//var sema: Sema = .{ var sema: Sema = .{
// .mod = mod, .mod = mod,
// .gpa = mod.gpa, .gpa = mod.gpa,
// .arena = &arena.allocator, .arena = &arena.allocator,
// .code = func.zir, .code = zir,
// .inst_map = try mod.gpa.alloc(*ir.Inst, func.zir.instructions.len), .inst_map = try mod.gpa.alloc(*ir.Inst, zir.instructions.len),
// .owner_decl = decl, .owner_decl = decl,
// .namespace = decl.namespace, .namespace = decl.namespace,
// .func = func, .func = func,
// .owner_func = func, .owner_func = func,
// .param_inst_list = param_inst_list, .param_inst_list = param_inst_list,
//}; };
//defer mod.gpa.free(sema.inst_map); defer mod.gpa.free(sema.inst_map);
//var inner_block: Scope.Block = .{ var inner_block: Scope.Block = .{
// .parent = null, .parent = null,
// .sema = &sema, .sema = &sema,
// .src_decl = decl, .src_decl = decl,
// .instructions = .{}, .instructions = .{},
// .inlining = null, .inlining = null,
// .is_comptime = false, .is_comptime = false,
//}; };
//defer inner_block.instructions.deinit(mod.gpa); defer inner_block.instructions.deinit(mod.gpa);
//// AIR currently requires the arg parameters to be the first N instructions // AIR currently requires the arg parameters to be the first N instructions
//try inner_block.instructions.appendSlice(mod.gpa, param_inst_list); try inner_block.instructions.appendSlice(mod.gpa, param_inst_list);
//func.state = .in_progress; func.state = .in_progress;
//log.debug("set {s} to in_progress", .{decl.name}); log.debug("set {s} to in_progress", .{decl.name});
//_ = try sema.root(&inner_block); try sema.analyzeFnBody(&inner_block, func.zir_body_inst);
//const instructions = try arena.allocator.dupe(*ir.Inst, inner_block.instructions.items); const instructions = try arena.allocator.dupe(*ir.Inst, inner_block.instructions.items);
//func.state = .success; func.state = .success;
//func.body = .{ .instructions = instructions }; func.body = .{ .instructions = instructions };
//log.debug("set {s} to success", .{decl.name}); log.debug("set {s} to success", .{decl.name});
} }
fn markOutdatedDecl(mod: *Module, decl: *Decl) !void { fn markOutdatedDecl(mod: *Module, decl: *Decl) !void {

37
src/Sema.zig
View File

@ -65,6 +65,39 @@ const LazySrcLoc = Module.LazySrcLoc;
const RangeSet = @import("RangeSet.zig"); const RangeSet = @import("RangeSet.zig");
const AstGen = @import("AstGen.zig"); const AstGen = @import("AstGen.zig");
pub fn analyzeFnBody(
sema: *Sema,
block: *Scope.Block,
fn_body_inst: Zir.Inst.Index,
) InnerError!void {
const tags = sema.code.instructions.items(.tag);
const datas = sema.code.instructions.items(.data);
const body: []const Zir.Inst.Index = switch (tags[fn_body_inst]) {
.func, .func_inferred => blk: {
const inst_data = datas[fn_body_inst].pl_node;
const extra = sema.code.extraData(Zir.Inst.Func, inst_data.payload_index);
const param_types_len = extra.data.param_types_len;
const body = sema.code.extra[extra.end + param_types_len ..][0..extra.data.body_len];
break :blk body;
},
.extended => blk: {
const extended = datas[fn_body_inst].extended;
assert(extended.opcode == .func);
const extra = sema.code.extraData(Zir.Inst.ExtendedFunc, extended.operand);
const small = @bitCast(Zir.Inst.ExtendedFunc.Small, extended.small);
var extra_index: usize = extra.end;
extra_index += @boolToInt(small.has_lib_name);
extra_index += @boolToInt(small.has_cc);
extra_index += @boolToInt(small.has_align);
extra_index += extra.data.param_types_len;
const body = sema.code.extra[extra_index..][0..extra.data.body_len];
break :blk body;
},
else => unreachable,
};
_ = try sema.analyzeBody(block, body);
}
/// Returns only the result from the body that is specified. /// Returns only the result from the body that is specified.
/// Only appropriate to call when it is determined at comptime that this body /// Only appropriate to call when it is determined at comptime that this body
/// has no peers. /// has no peers.
@ -2088,11 +2121,9 @@ fn analyzeCall(
try inline_sema.emitBackwardBranch(&child_block, call_src); try inline_sema.emitBackwardBranch(&child_block, call_src);
if (true) @panic("TODO re-implement inline function calls");
// This will have return instructions analyzed as break instructions to // This will have return instructions analyzed as break instructions to
// the block_inst above. // the block_inst above.
_ = try inline_sema.root(&child_block); try inline_sema.analyzeFnBody(&child_block, module_fn.zir_body_inst);
const result = try inline_sema.analyzeBlockBody(block, call_src, &child_block, merges); const result = try inline_sema.analyzeBlockBody(block, call_src, &child_block, merges);