Commit 7e303fa28feaa10d7dbf08fdc3e86c47bba882e6 | zig | Meg's Mirrors

author	Andrew Kelley <andrew@ziglang.org> 2019-06-22 19:02:59-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-06-22 19:02:59-04:00
log	7e303fa28feaa10d7dbf08fdc3e86c47bba882e6
tree	98cbbc5f4f5c7100878913559cd7e59f50a88db5
parent	2b1695b1b03b42719f02c4ed4d4b5d3495a2ca3a
signature	Commit is signed but in an unrecognized format.

fix another crash

2 files changed, 4 insertions(+), 1 deletions(-)

src
- ir.cpp
std
- std.zig

src/ir.cpp+3

...	...	@@ -15092,6 +15092,9 @@ static IrInstruction ir_resolve_result_raw(IrAnalyze ira, IrInstruction *suspe
15092	15092	if (is_comptime)
15093	15093	return nullptr;
15094	15094	}
	15095	if ((err = type_resolve(ira->codegen, ira->explicit_return_type, ResolveStatusZeroBitsKnown))) {
	15096	return ira->codegen->invalid_instruction;
	15097	}
15095	15098	if (!type_has_bits(ira->explicit_return_type) \|\| !handle_is_ptr(ira->explicit_return_type))
15096	15099	return nullptr;
15097	15100

std/std.zig+1-1

...	...	@@ -91,7 +91,7 @@ test "std" {
91	91	_ = @import("heap.zig");
92	92	_ = @import("io.zig");
93	93	_ = @import("json.zig");
94		//_ = @import("lazy_init.zig");
	94	_ = @import("lazy_init.zig");
95	95	_ = @import("macho.zig");
96	96	_ = @import("math.zig");
97	97	_ = @import("mem.zig");