diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-10-26 16:07:46 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-10-26 16:07:46 -0700 |
| commit | e2caf5752791cb81cd1110617d646e87f360e11b (patch) | |
| tree | 05ab938c8898eb737198391dd0ceddb3784e0aba /src/stage1/analyze.cpp | |
| parent | c1ae9f40c728e769e804eabfcab0b40d6c0f67f2 (diff) | |
| parent | 435c8ad703503e4dcc102b0907b45459d2693822 (diff) | |
| download | zig-e2caf5752791cb81cd1110617d646e87f360e11b.tar.gz zig-e2caf5752791cb81cd1110617d646e87f360e11b.zip | |
Merge branch 'frmdstryr-import-empty-file'
Diffstat (limited to 'src/stage1/analyze.cpp')
| -rw-r--r-- | src/stage1/analyze.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/stage1/analyze.cpp b/src/stage1/analyze.cpp index 04c064efe3..fd0de8e907 100644 --- a/src/stage1/analyze.cpp +++ b/src/stage1/analyze.cpp @@ -1988,7 +1988,7 @@ static ZigType *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *child_sc // behaviour when checking expected alignment with `@ptrToInt(fn_ptr)` // or similar. This commit proposes to make `align` expressions a // compile error when compiled to Wasm architecture. - // + // // Some references: // [1] [Mozilla: WebAssembly Tables](https://developer.mozilla.org/en-US/docs/WebAssembly/Understanding_the_text_format#WebAssembly_tables) // [2] [Sunfishcode's Wasm Ref Manual](https://github.com/sunfishcode/wasm-reference-manual/blob/master/WebAssembly.md#indirect-call) @@ -9044,7 +9044,7 @@ static void resolve_llvm_types_optional(CodeGen *g, ZigType *type, ResolveStatus 8 * child_type->abi_align, val_offset_in_bits, ZigLLVM_DIFlags_Zero, child_llvm_di_type); - di_element_types[maybe_null_index] = + di_element_types[maybe_null_index] = ZigLLVMCreateDebugMemberType(g->dbuilder, ZigLLVMTypeToScope(type->llvm_di_type), "maybe", di_file, line, 8*g->builtin_types.entry_bool->abi_size, |