# Merge branch 'address-space' of Snektron/zig into Snektron-address-space · gitcafe/zig

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

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

Visibility: public

Requested revision: f8b914fcf328b30f98d31bb6461c953e4b7a33a7

Requested commit: f8b914fcf328b30f98d31bb6461c953e4b7a33a7

Commit: f8b914fcf328b30f98d31bb6461c953e4b7a33a7

Tree: 06b74c36e25e94c1a8a5e384d289ffd556fdd4a9

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'address-space' of Snektron/zig into Snektron-address-space

There were two things to resolve here:
 * Snektron's branch edited Zir printing, but in master branch
   I moved the printing code from Zir.zig to print_zir.zig. So that
   just had to be moved over.
 * In master branch I fleshed out coerceInMemory a bit more, which
   caused one of Snektron's test cases to fail, so I had to add
   addrspace awareness to that. Once I did that the tests passed again.

```

## Parents

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

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

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