diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-09-13 15:39:19 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-09-13 15:39:19 -0700 |
| commit | 716d9237cb757c15217b21964fde8e755aabe853 (patch) | |
| tree | 92760021e4d49af92db2d37701f4a303d32d69ac /src/stage1/analyze.cpp | |
| parent | fda6d44778f3faf53c66945a0db65be68113416f (diff) | |
| parent | 0a4cfb81bcca0ca514758049f8d7d99224537f93 (diff) | |
| download | zig-716d9237cb757c15217b21964fde8e755aabe853.tar.gz zig-716d9237cb757c15217b21964fde8e755aabe853.zip | |
Merge remote-tracking branch 'origin/llvm15'
Upgrade to LLVM 15
Diffstat (limited to 'src/stage1/analyze.cpp')
| -rw-r--r-- | src/stage1/analyze.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/stage1/analyze.cpp b/src/stage1/analyze.cpp index 90173f384e..f0cad841be 100644 --- a/src/stage1/analyze.cpp +++ b/src/stage1/analyze.cpp @@ -9753,6 +9753,7 @@ static void resolve_llvm_types_any_frame(CodeGen *g, ZigType *any_frame_type, Re Buf *name = buf_sprintf("(%s header)", buf_ptr(&any_frame_type->name)); LLVMTypeRef frame_header_type = LLVMStructCreateNamed(LLVMGetGlobalContext(), buf_ptr(name)); any_frame_type->llvm_type = LLVMPointerType(frame_header_type, 0); + any_frame_type->data.any_frame.struct_llvm_ty = frame_header_type; unsigned dwarf_kind = ZigLLVMTag_DW_structure_type(); ZigLLVMDIFile *di_file = nullptr; @@ -9775,7 +9776,8 @@ static void resolve_llvm_types_any_frame(CodeGen *g, ZigType *any_frame_type, Re const unsigned fn_addrspace = ZigLLVMDataLayoutGetProgramAddressSpace(g->target_data_ref); LLVMTypeRef ptr_fn_llvm_type = LLVMPointerType(fn_type, fn_addrspace); if (result_type == nullptr) { - g->anyframe_fn_type = ptr_fn_llvm_type; + g->any_frame_header_llvm_ty = frame_header_type; + g->anyframe_fn_type = fn_type; } ZigList<LLVMTypeRef> field_types = {}; |
