Skip to content

Commit 0227580

Browse files
Fix top of LLVM, and remove upper limit of LLVM version from CMakeLists. (#8568)
* Fix top of LLVM. * No upper limit to LLVM in CMakeLists. * Update CMakeLists.txt Co-authored-by: Alex Reinking <[email protected]> --------- Co-authored-by: Alex Reinking <[email protected]>
1 parent b937537 commit 0227580

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ option(THREADS_PREFER_PTHREAD_FLAG "When enabled, prefer to use the -pthread fla
196196
find_package(Threads REQUIRED)
197197

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

src/CodeGen_LLVM.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ Value *CodeGen_LLVM::register_destructor(llvm::Function *destructor_fn, Value *o
748748
IRBuilderBase::InsertPoint here = builder->saveIP();
749749
BasicBlock *dtors = get_destructor_block();
750750

751-
builder->SetInsertPoint(dtors->getFirstNonPHI());
751+
builder->SetInsertPoint(dtors->getFirstNonPHIIt());
752752

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

0 commit comments

Comments
 (0)