# Merge remote-tracking branch 'origin/master' into ast-memory-layout · gitcafe/zig

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

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

Visibility: public

Requested revision: b4e344bcf859f2df89637e0825a2e0e57d092ef6

Requested commit: b4e344bcf859f2df89637e0825a2e0e57d092ef6

Commit: b4e344bcf859f2df89637e0825a2e0e57d092ef6

Tree: 44465c5c3eadcfdc57f0a0a3eb5cffff9107bd7f

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into ast-memory-layout

Conflicts:
 * lib/std/zig/ast.zig
 * lib/std/zig/parse.zig
 * lib/std/zig/parser_test.zig
 * lib/std/zig/render.zig
 * src/Module.zig
 * src/zir.zig

I resolved some of the conflicts by reverting a small portion of
@tadeokondrak's stage2 logic here regarding `callconv(.Inline)`.
It will need to get reworked as part of this branch.

```

## Parents

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

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

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