diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-03-02 15:34:58 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-03-02 15:34:58 -0500 |
| commit | f7835000b62fb5b501f1d84c90f56e2aa11bc55a (patch) | |
| tree | 92a0b659ac6f077359ba1e5fbdc1c1de86b297e6 /src/codegen.cpp | |
| parent | ea5cedced1aa6bb5e1c1a07fcd16c5bed08c971f (diff) | |
| download | zig-f7835000b62fb5b501f1d84c90f56e2aa11bc55a.tar.gz zig-f7835000b62fb5b501f1d84c90f56e2aa11bc55a.zip | |
@returnAddress and @frameAddress return usize now
Diffstat (limited to 'src/codegen.cpp')
| -rw-r--r-- | src/codegen.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp index 52e20108de..071dd1fde4 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -4661,7 +4661,8 @@ static LLVMValueRef ir_render_return_address(CodeGen *g, IrExecutable *executabl IrInstructionReturnAddress *instruction) { LLVMValueRef zero = LLVMConstNull(g->builtin_types.entry_i32->type_ref); - return LLVMBuildCall(g->builder, get_return_address_fn_val(g), &zero, 1, ""); + LLVMValueRef ptr_val = LLVMBuildCall(g->builder, get_return_address_fn_val(g), &zero, 1, ""); + return LLVMBuildPtrToInt(g->builder, ptr_val, g->builtin_types.entry_usize->type_ref, ""); } static LLVMValueRef get_frame_address_fn_val(CodeGen *g) { @@ -4682,7 +4683,8 @@ static LLVMValueRef ir_render_frame_address(CodeGen *g, IrExecutable *executable IrInstructionFrameAddress *instruction) { LLVMValueRef zero = LLVMConstNull(g->builtin_types.entry_i32->type_ref); - return LLVMBuildCall(g->builder, get_frame_address_fn_val(g), &zero, 1, ""); + LLVMValueRef ptr_val = LLVMBuildCall(g->builder, get_frame_address_fn_val(g), &zero, 1, ""); + return LLVMBuildPtrToInt(g->builder, ptr_val, g->builtin_types.entry_usize->type_ref, ""); } static LLVMValueRef get_handle_fn_val(CodeGen *g) { |
