mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-25 08:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix not jumping to entry

Browse Source
This commit is contained in:
Andrew Kelley 2019-07-21 17:10:16 -04:00
parent 27a5f2c4fa
commit 6053ca4f69
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/codegen.cpp
View File

@ -6413,6 +6413,7 @@ static void do_code_gen(CodeGen *g) {
ZigLLVMSetCurrentDebugLocation(g->builder, (int)source_node->line + 1,
(int)source_node->column + 1, get_di_scope(g, fn_table_entry->child_scope));
}
IrExecutable *executable = &fn_table_entry->analyzed_executable;
LLVMTypeRef usize_type_ref = g->builtin_types.entry_usize->llvm_type;
LLVMBasicBlockRef bad_resume_block = LLVMAppendBasicBlock(g->cur_fn_val, "BadResume");
LLVMPositionBuilderAtEnd(g->builder, bad_resume_block);
@ -6429,15 +6430,19 @@ static void do_code_gen(CodeGen *g) {
LLVMValueRef resume_index_ptr = LLVMBuildStructGEP(g->builder, g->cur_ret_ptr,
coro_resume_index_index, "");
LLVMValueRef resume_index = LLVMBuildLoad(g->builder, resume_index_ptr, "");
// The +1 is because index 0 is reserved for getting the size.
// +1 - index 0 is reserved for the entry block
// +1 - index 1 is reserved for getting the size.
LLVMValueRef switch_instr = LLVMBuildSwitch(g->builder, resume_index, bad_resume_block,
fn_table_entry->resume_blocks.length + 1);
fn_table_entry->resume_blocks.length + 2);
LLVMValueRef zero = LLVMConstNull(usize_type_ref);
LLVMAddCase(switch_instr, zero, get_size_block);
LLVMAddCase(switch_instr, zero, executable->basic_block_list.at(0)->llvm_block);
LLVMValueRef one = LLVMConstInt(usize_type_ref, 1, false);
LLVMAddCase(switch_instr, one, get_size_block);
for (size_t resume_i = 0; resume_i < fn_table_entry->resume_blocks.length; resume_i += 1) {
LLVMValueRef case_value = LLVMConstInt(usize_type_ref, resume_i + 1, false);
LLVMValueRef case_value = LLVMConstInt(usize_type_ref, resume_i + 2, false);
LLVMAddCase(switch_instr, case_value, fn_table_entry->resume_blocks.at(resume_i)->llvm_block);
}
}

6
src/ir.cpp
View File

@ -24121,9 +24121,11 @@ static IrInstruction *ir_analyze_instruction_suspend_br(IrAnalyze *ira, IrInstru
ZigFn *fn_entry = exec_fn_entry(ira->new_irb.exec);
ir_assert(fn_entry != nullptr, &instruction->base);
// +2 - one for the GetSize block, one for the Entry block, resume blocks are indexed after that.
new_bb->resume_index = fn_entry->resume_blocks.length + 2;
fn_entry->resume_blocks.append(new_bb);
// This is done after appending the block because resume_index 0 is reserved for querying the size.
new_bb->resume_index = fn_entry->resume_blocks.length;
ir_push_resume_block(ira, old_dest_block);