Revert "Merge pull request #10270 from Luukdegram/behaviour-tests"

This reverts commit 725267f7c2, reversing
changes made to 2dae860de3.

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.
This commit is contained in:
Andrew Kelley
2021-12-04 21:55:50 -07:00
parent 117c0460d3
commit f7cbd92e6c
7 changed files with 288 additions and 505 deletions

View File

@@ -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"