# Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/c9cc09a3bfb45d93b84577238047cd69ef0a7d88)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: c9cc09a3bfb45d93b84577238047cd69ef0a7d88

Requested commit: c9cc09a3bfb45d93b84577238047cd69ef0a7d88

Commit: c9cc09a3bfb45d93b84577238047cd69ef0a7d88

Tree: 1686cda92ae0c5d9ae55c02e7755c55d4e6f3c18

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

Conflicts:
 * lib/std/os/linux.zig
 * lib/std/os/windows/bits.zig
 * src/Module.zig
 * src/Sema.zig
 * test/stage2/test.zig

Mainly I wanted Jakub's new macOS code for respecting stack size, since
we now depend on it for debug builds able to pass one of the test cases
for recursive comptime function calls with `@setEvalBranchQuota`.

The conflicts were all trivial.

```

## Parents

- [71afc3088009944fcd8339ac71e69a0b77a781ab](https://git.cafe/gitcafe/zig/commit/71afc3088009944fcd8339ac71e69a0b77a781ab?format=markdown)

- [40a47eae65b918866abc9d745f89d837f6a1e591](https://git.cafe/gitcafe/zig/commit/40a47eae65b918866abc9d745f89d837f6a1e591?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/c9cc09a3bfb45d93b84577238047cd69ef0a7d88?format=markdown)