-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Fix jit build break #32927
Fix jit build break #32927
Conversation
Two changes to codegencommon.cpp were merged in short order, and git/github did not spot the merge conflict. Fixes dotnet#32926.
cc @kunalspathak @dotnet/jit-contrib @benaadams |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Will eagerly merge once a few builds pass. |
Probably I will add a note in |
(Building locally too, but it takes forever...) |
Needs a tweak... |
Think this is far enough along to merge. |
We have started seeing some build breaks on OSX that look like:
@AndyAyersMS Would that be related to this PR? cc: @layomia |
Yes, that error should be fixed by this PR. |
Yeah I thought this was causing that issue because we were seeing this in PR #32006 when re-running the checks about 1 hour ago, but looks like the reason for that is that it wasn't yet picking up this change, so we needed to close and then re-open the PR or to push a new commit to it in order to get the changes from here in order to fix that issue. |
Two changes to codegencommon.cpp were merged in short order, and
git/github did not spot the merge conflict.
Fixes #32926.