Skip to content
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

Merge needed march release followups into mesh nodes #6786

Merged

Conversation

pow2clk
Copy link
Member

@pow2clk pow2clk commented Jul 15, 2024

Merges the following changes into mesh nodes to fix a known bug that required a point release in the march release branch and also some build fixes for new visual studio diagnostics.

9ca52f4 Add duplicate pragma (#6732)
7809c0b Remove Windows C++ redist hack (#6692)
33277a1 Workaround broken GitHub runner images (#6683)
1b9a796 [Sema] Check FunctionDecl has identifier before getName. (#6439) (#6457)

) (microsoft#6457)

Use identifier name without check the identifier exists will cause
crash.

Fixes microsoft#6426

---------

Co-authored-by: Tex Riddell <[email protected]>
Co-authored-by: github-actions[bot]
<github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 7581ff4)
(cherry picked from commit 11e1318)
@pow2clk pow2clk requested a review from a team as a code owner July 15, 2024 21:28
@pow2clk pow2clk enabled auto-merge (squash) July 15, 2024 21:30
@pow2clk
Copy link
Member Author

pow2clk commented Jul 15, 2024

The failure looks like a fluke. I can't see any actual failure message in the log. Rerunning

llvm-beanz and others added 3 commits July 15, 2024 17:11
This PR contains two changes:
1) Moves a pragma to disable a warning, which seems to be required by
the new compiler.
2) Adds a preprocessor define to workaround the crashes caused by the
runner image mismatching C++ runtime versions.

The second change we will want to revert once the runner images are
fixed. The issue tracking the runner images is:

actions/runner-images#10004

Related microsoft#6668

(cherry picked from commit 0b9acdb)
This removes the hack introduced in microsoft#6683 to workaround issues in the
GitHub and ADO runner image:
actions/runner-images#10004

Rumor has it the runner images are now fixed... let's see.

Fixes microsoft#6674

(cherry picked from commit 98bb80a)
Internal build that has DXC as a submodule and that is built with a
different VC toolset version started failing after the pragma got moved
up in commit 0b9acdb. Adding a duplicate pragma back at the original
location makes both compiler versions happy.

(cherry picked from commit 49d1ae9)
@pow2clk
Copy link
Member Author

pow2clk commented Jul 16, 2024

This raft of cherry picks that collectively change just one line should be enough to fix the debug build and also keep the history consistent with main. They became necessary due to changes in the way MSVC produces warnings

@pow2clk pow2clk changed the title [Sema] Check FunctionDecl has identifier before getName. (#6439) (#6457) Merge needed march release followups into mesh nodes Jul 16, 2024
@pow2clk pow2clk disabled auto-merge July 16, 2024 02:23
@pow2clk pow2clk merged commit 2f29f17 into microsoft:release-preview-mesh-nodes Jul 16, 2024
14 checks passed
@pow2clk pow2clk deleted the mesh-nodes-update branch July 16, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants