diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-08-13 11:39:32 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-08-13 11:39:32 -0400 |
| commit | 8a9289996ab8ed7da2f7e0c6df9fe2bd9a3e0b7b (patch) | |
| tree | 28aa8644ce1ea7c3756c88a9948ad2d11a9b24c8 /src/analyze.cpp | |
| parent | 24d5ec078355d68e3f1002220fd284b1ff02a465 (diff) | |
| parent | 98183e47436699f6e5eab200061c46eec342806e (diff) | |
| download | zig-8a9289996ab8ed7da2f7e0c6df9fe2bd9a3e0b7b.tar.gz zig-8a9289996ab8ed7da2f7e0c6df9fe2bd9a3e0b7b.zip | |
Merge remote-tracking branch 'origin/master' into rewrite-coroutines
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index 9cd3ba026b..744640084c 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -7350,20 +7350,21 @@ static void resolve_llvm_types_error_union(CodeGen *g, ZigType *type) { uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, type->llvm_type); uint64_t debug_align_in_bits = 8*LLVMABISizeOfType(g->target_data_ref, type->llvm_type); - ZigLLVMDIType *di_element_types[] = { - ZigLLVMCreateDebugMemberType(g->dbuilder, ZigLLVMTypeToScope(type->llvm_di_type), + ZigLLVMDIType *di_element_types[2]; + di_element_types[err_union_err_index] = ZigLLVMCreateDebugMemberType(g->dbuilder, + ZigLLVMTypeToScope(type->llvm_di_type), "tag", di_file, line, tag_debug_size_in_bits, tag_debug_align_in_bits, tag_offset_in_bits, - ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, err_set_type)), - ZigLLVMCreateDebugMemberType(g->dbuilder, ZigLLVMTypeToScope(type->llvm_di_type), + ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, err_set_type)); + di_element_types[err_union_payload_index] = ZigLLVMCreateDebugMemberType(g->dbuilder, + ZigLLVMTypeToScope(type->llvm_di_type), "value", di_file, line, value_debug_size_in_bits, value_debug_align_in_bits, value_offset_in_bits, - ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, payload_type)), - }; + ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, payload_type)); ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder, compile_unit_scope, |