Skip to content

resinator: Fix INCLUDE var handling and sync with upstream #17608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2023

Conversation

squeek502
Copy link
Collaborator

@squeek502 squeek502 commented Oct 19, 2023

src/ changes:

src/resinator changes:

  • Revert the INCLUDE env var related changes in 09dea95 since INCLUDE is now never read by anything except zig rc
  • Added proper error handling when failing to open the CWD for the .rc compilation (an improvement on a change in 09dea95)
  • Fixes for various bugs found when fuzz testing
  • Made it use platform-specific delimiters when parsing INCLUDE

The INCLUDE variable being used during `.rc` preprocessing was an accidental regression in ziglang#17412.
Closes ziglang#17585.

resinator changes:
source_mapping: Protect against NUL bytes in #line filenames
lex: Avoid recalculating column on every tab stop within string literals
Proper error handling for failing to open cwd instead of `catch unreachable`
Use platform-specific delimiter for INCLUDE env var parsing
@andrewrk
Copy link
Member

Thanks!

@andrewrk andrewrk enabled auto-merge October 19, 2023 01:53
@andrewrk andrewrk merged commit a361f37 into ziglang:master Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

resinator should not observe any environment variables
2 participants