aboutsummaryrefslogtreecommitdiff
path: root/src/Module.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-12-04 21:55:50 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-12-04 21:55:50 -0700
commitf7cbd92e6ca531fc19dce1f233b5c8ca0479eeb5 (patch)
tree345e9325e58e5992b32a7bc6b5aeeb08ade3e2ae /src/Module.zig
parent117c0460d3f5ff05d5e2c51c2aa376b56be13096 (diff)
downloadzig-f7cbd92e6ca531fc19dce1f233b5c8ca0479eeb5.tar.gz
zig-f7cbd92e6ca531fc19dce1f233b5c8ca0479eeb5.zip
Revert "Merge pull request #10270 from Luukdegram/behaviour-tests"
This reverts commit 725267f7c20f0ba588b472048a8c1fe1a328c714, reversing changes made to 2dae860de3494f97c9477af9282fe0131ff5c4cb. This test is failing: ```zig pub fn main() u8 { var e = foo(); const i = e catch 69; return i; } fn foo() anyerror!u8 { return 5; } ``` It's returning 69 instead of the expected value 5.
Diffstat (limited to 'src/Module.zig')
-rw-r--r--src/Module.zig12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/Module.zig b/src/Module.zig
index 7fa91486d3..7ef9a02e09 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -1226,20 +1226,19 @@ pub const Fn = struct {
};
pub fn deinit(func: *Fn, gpa: Allocator) void {
- if (func.getInferredErrorSet()) |error_set_data| {
- error_set_data.map.deinit(gpa);
- error_set_data.functions.deinit(gpa);
+ if (func.getInferredErrorSet()) |map| {
+ map.deinit(gpa);
}
}
- pub fn getInferredErrorSet(func: *Fn) ?*Type.Payload.ErrorSetInferred.Data {
+ pub fn getInferredErrorSet(func: *Fn) ?*std.StringHashMapUnmanaged(void) {
const ret_ty = func.owner_decl.ty.fnReturnType();
if (ret_ty.tag() == .generic_poison) {
return null;
}
if (ret_ty.zigTypeTag() == .ErrorUnion) {
if (ret_ty.errorUnionSet().castTag(.error_set_inferred)) |payload| {
- return &payload.data;
+ return &payload.data.map;
}
}
return null;
@@ -1302,7 +1301,6 @@ pub const Namespace = struct {
key.destroy(mod);
}
anon_decls.deinit(gpa);
- ns.usingnamespace_set.deinit(gpa);
}
pub fn deleteAllDecls(
@@ -1334,8 +1332,6 @@ pub const Namespace = struct {
child_decl.destroy(mod);
}
anon_decls.deinit(gpa);
-
- ns.usingnamespace_set.deinit(gpa);
}
// This renders e.g. "std.fs.Dir.OpenOptions"