Skip to content

Fix top of LLVM, and remove upper limit of LLVM version from CMakeLists. #8568

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.

Sign up for GitHub

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
abadams merged 3 commits into from
Feb 10, 2025
Merged

Fix top of LLVM, and remove upper limit of LLVM version from CMakeLists. #8568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3f73fb
Fix top of LLVM.
mcourteaux Feb 9, 2025
4bb0dea
No upper limit to LLVM in CMakeLists.
mcourteaux Feb 9, 2025
3aa8827
Update CMakeLists.txt
mcourteaux Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ option(THREADS_PREFER_PTHREAD_FLAG "When enabled, prefer to use the -pthread fla
find_package(Threads REQUIRED)

## LLVM
find_package(Halide_LLVM 18...20 REQUIRED
find_package(Halide_LLVM 18...99 REQUIRED # Use 99 to fake a minimum-only constraint
COMPONENTS WebAssembly X86
OPTIONAL_COMPONENTS AArch64 ARM Hexagon NVPTX PowerPC RISCV)

Expand Down
2 changes: 1 addition & 1 deletion src/CodeGen_LLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ Value *CodeGen_LLVM::register_destructor(llvm::Function *destructor_fn, Value *o
IRBuilderBase::InsertPoint here = builder->saveIP();
BasicBlock *dtors = get_destructor_block();

builder->SetInsertPoint(dtors->getFirstNonPHI());
builder->SetInsertPoint(dtors->getFirstNonPHIIt());

PHINode *error_code = dyn_cast<PHINode>(dtors->begin());
internal_assert(error_code) << "The destructor block is supposed to start with a phi node\n";
Expand Down