Skip to content

Commit a44162c

Browse files
committed
IRBuilder: Resolve ambiguous call
It looks like the addition of a defaulted parameter to `llvm::IRBuilderBase::CreateOr` in llvm/llvm-project#146350 caused it to conflict with our own version of the method. Sync up their signatures.
1 parent 6978577 commit a44162c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/IRGen/IRBuilder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ class IRBuilder : public IRBuilderBase {
139139

140140
using IRBuilderBase::CreateOr;
141141
llvm::Value *CreateOr(llvm::Value *LHS, llvm::Value *RHS,
142-
const Twine &Name = "") {
142+
const Twine &Name = "", bool IsDisjoint = false) {
143143
if (auto *RC = dyn_cast<llvm::Constant>(RHS))
144144
if (RC->isNullValue())
145145
return LHS; // LHS | 0 -> LHS
146-
return IRBuilderBase::CreateOr(LHS, RHS, Name);
146+
return IRBuilderBase::CreateOr(LHS, RHS, Name, IsDisjoint);
147147
}
148148
llvm::Value *CreateOr(llvm::Value *LHS, const APInt &RHS,
149149
const Twine &Name = "") {

0 commit comments

Comments
 (0)