authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-12-04 16:29:38+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-12-04 12:39:01-07:00
log32997a2fb06edd4365116d07d88de742b59df84d
tree73ea5e889469bc861bd8e632e1872e9ea9236e27
parenta1d0c77539336019f6011e4e98ace3302da5765e

Merge pull request #7293 from kubkon/fix-7030

stage1: allow idx 0 err to be put into error_name_table

4 files changed, 22 insertions(+), 6 deletions(-)

src/stage1/codegen.cpp+2-6
......@@ -5184,11 +5184,7 @@ static LLVMValueRef ir_render_ref(CodeGen *g, IrExecutableGen *executable, IrIns
51845184
51855185static LLVMValueRef ir_render_err_name(CodeGen *g, IrExecutableGen *executable, IrInstGenErrName *instruction) {
51865186 assert(g->generate_error_name_table);
5187
5188 if (g->errors_by_index.length == 1) {
5189 LLVMBuildUnreachable(g->builder);
5190 return nullptr;
5191 }
5187 assert(g->errors_by_index.length > 0);
51925188
51935189 LLVMValueRef err_val = ir_llvm_value(g, instruction->value);
51945190 if (ir_want_runtime_safety(g, &instruction->base)) {
......@@ -7870,7 +7866,7 @@ static void render_const_val_global(CodeGen *g, ZigValue *const_val, const char
78707866}
78717867
78727868static void generate_error_name_table(CodeGen *g) {
7873 if (g->err_name_table != nullptr || !g->generate_error_name_table || g->errors_by_index.length == 1) {
7869 if (g->err_name_table != nullptr || !g->generate_error_name_table) {
78747870 return;
78757871 }
78767872
test/standalone.zig+1
......@@ -19,6 +19,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
1919 cases.addBuildFile("test/standalone/use_alias/build.zig");
2020 cases.addBuildFile("test/standalone/brace_expansion/build.zig");
2121 cases.addBuildFile("test/standalone/empty_env/build.zig");
22 cases.addBuildFile("test/standalone/issue_7030/build.zig");
2223 if (std.Target.current.os.tag != .wasi) {
2324 cases.addBuildFile("test/standalone/load_dynamic_library/build.zig");
2425 }
test/standalone/issue_7030/build.zig created+14
......@@ -0,0 +1,14 @@
1const Builder = @import("std").build.Builder;
2
3pub fn build(b: *Builder) void {
4 const exe = b.addExecutable("issue_7030", "main.zig");
5 exe.setTarget(.{
6 .cpu_arch = .wasm32,
7 .os_tag = .freestanding,
8 });
9 exe.install();
10 b.default_step.dependOn(&exe.step);
11
12 const test_step = b.step("test", "Test the program");
13 test_step.dependOn(&exe.step);
14}
test/standalone/issue_7030/main.zig created+5
......@@ -0,0 +1,5 @@
1const std = @import("std");
2
3pub fn main() anyerror!void {
4 std.log.info("All your codebase are belong to us.", .{});
5}