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

[analyzer] Add missing include <unordered_map> to llvm/lib/Support/Z3Solver.cpp #106410

Merged
merged 1 commit into from
Aug 29, 2024

Conversation

lukeshingles
Copy link
Contributor

@lukeshingles lukeshingles commented Aug 28, 2024

Resolves #106361. Adding #include <unordered_map> to llvm/lib/Support/Z3Solver.cpp fixes compilation errors for homebrew build on macOS with Xcode 14. https://github.com/Homebrew/homebrew-core/actions/runs/10604291631/job/29390993615?pr=181351 shows that this is resolved when the include is patched in (Linux CI failure is due to unrelated timeout).

Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@lukeshingles lukeshingles marked this pull request as ready for review August 28, 2024 18:48
@llvmbot
Copy link
Member

llvmbot commented Aug 28, 2024

@llvm/pr-subscribers-llvm-support

Author: Luke Shingles (lukeshingles)

Changes

Resolves #106361. The homebrew build with #include <unordered_map> patched into Z3Solver.cpp (https://github.com/Homebrew/homebrew-core/actions/runs/10595188343/job/29362431446?pr=181351) now compiles (new failures are homebrew specific issues related to blocking non-release versions in macOS or CI 6 hr timeout on Linux).


Full diff: https://github.com/llvm/llvm-project/pull/106410.diff

1 Files Affected:

  • (modified) llvm/lib/Support/Z3Solver.cpp (+1)
diff --git a/llvm/lib/Support/Z3Solver.cpp b/llvm/lib/Support/Z3Solver.cpp
index 5a34ff160f6cf4..9aece099b06295 100644
--- a/llvm/lib/Support/Z3Solver.cpp
+++ b/llvm/lib/Support/Z3Solver.cpp
@@ -19,6 +19,7 @@ using namespace llvm;
 #include "llvm/ADT/Twine.h"
 
 #include <set>
+#include <unordered_map>
 
 #include <z3.h>
 

@tamird
Copy link
Member

tamird commented Aug 28, 2024

Will also need to be cherry-picked in https://github.com/llvm/llvm-project/tree/release/19.x.

@lukeshingles
Copy link
Contributor Author

lukeshingles commented Aug 29, 2024

@NagyDonat since you reviewed #97265, maybe you can review this fix?

@tamird tamird merged commit fcb3a04 into llvm:main Aug 29, 2024
9 checks passed
Copy link

@lukeshingles Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

@tamird
Copy link
Member

tamird commented Aug 29, 2024

/cherry-pick 63c3de4

@llvmbot
Copy link
Member

llvmbot commented Aug 29, 2024

/cherry-pick 63c3de4

Error: Command failed due to missing milestone.

@tamird tamird added this to the LLVM 19.X Release milestone Aug 29, 2024
@tamird
Copy link
Member

tamird commented Aug 29, 2024

/cherry-pick 63c3de4

@llvmbot
Copy link
Member

llvmbot commented Aug 29, 2024

Failed to cherry-pick: 63c3de4

https://github.com/llvm/llvm-project/actions/runs/10613204816

Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request

@tamird
Copy link
Member

tamird commented Aug 29, 2024

/cherry-pick fcb3a04

llvmbot pushed a commit to llvmbot/llvm-project that referenced this pull request Aug 29, 2024
…Solver.cpp (llvm#106410)

Resolves llvm#106361. Adding #include <unordered_map> to
llvm/lib/Support/Z3Solver.cpp fixes compilation errors for homebrew
build on macOS with Xcode 14.
https://github.com/Homebrew/homebrew-core/actions/runs/10604291631/job/29390993615?pr=181351
shows that this is resolved when the include is patched in (Linux CI
failure is due to unrelated timeout).

(cherry picked from commit fcb3a04)
@llvmbot
Copy link
Member

llvmbot commented Aug 29, 2024

/pull-request #106525

tru pushed a commit to llvmbot/llvm-project that referenced this pull request Sep 1, 2024
…Solver.cpp (llvm#106410)

Resolves llvm#106361. Adding #include <unordered_map> to
llvm/lib/Support/Z3Solver.cpp fixes compilation errors for homebrew
build on macOS with Xcode 14.
https://github.com/Homebrew/homebrew-core/actions/runs/10604291631/job/29390993615?pr=181351
shows that this is resolved when the include is patched in (Linux CI
failure is due to unrelated timeout).

(cherry picked from commit fcb3a04)
qiaojbao pushed a commit to GPUOpen-Drivers/llvm-project that referenced this pull request Sep 30, 2024
…372303add

Local branch amd-gfx 4253723 Merged main:efad561890ad3584c38adae913f9939384eb804c into amd-gfx:4b0f66167c79
Remote branch main fcb3a04 [analyzer] Add missing include <unordered_map> to llvm/lib/Support/Z3Solver.cpp (llvm#106410)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

Build failure with ENABLE_Z3_SOLVER=ON for homebrew
3 participants