From 1c7877f31bf87c415d21e5eb8cd3e2e61a8ffc23 Mon Sep 17 00:00:00 2001 From: Simon Moll Date: Tue, 8 Jun 2021 13:55:21 +0200 Subject: [PATCH] [VE][NFC] IRBuilder<> -> IRBuilderBase VE's TTI broke with the switch from IRBuilder<> to IRBuilderBase. Following that change to compile again. --- lib/Target/VE/VEISelLowering.cpp | 5 +++-- lib/Target/VE/VEISelLowering.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Target/VE/VEISelLowering.cpp b/lib/Target/VE/VEISelLowering.cpp index 2f65ccd62f9..b297e0fcd1a 100644 --- a/lib/Target/VE/VEISelLowering.cpp +++ b/lib/Target/VE/VEISelLowering.cpp @@ -29,6 +29,7 @@ #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/IR/Function.h" +#include "llvm/IR/IRBuilder.h" #include "llvm/IR/Module.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/KnownBits.h" @@ -997,7 +998,7 @@ SDValue VETargetLowering::makeAddress(SDValue Op, SelectionDAG &DAG) const { // The mappings for emitLeading/TrailingFence for VE is designed by following // http://www.cl.cam.ac.uk/~pes20/cpp/cpp0xmappings.html -Instruction *VETargetLowering::emitLeadingFence(IRBuilder<> &Builder, +Instruction *VETargetLowering::emitLeadingFence(IRBuilderBase &Builder, Instruction *Inst, AtomicOrdering Ord) const { switch (Ord) { @@ -1018,7 +1019,7 @@ Instruction *VETargetLowering::emitLeadingFence(IRBuilder<> &Builder, llvm_unreachable("Unknown fence ordering in emitLeadingFence"); } -Instruction *VETargetLowering::emitTrailingFence(IRBuilder<> &Builder, +Instruction *VETargetLowering::emitTrailingFence(IRBuilderBase &Builder, Instruction *Inst, AtomicOrdering Ord) const { switch (Ord) { diff --git a/lib/Target/VE/VEISelLowering.h b/lib/Target/VE/VEISelLowering.h index 1191bb995ae..883cd21a552 100644 --- a/lib/Target/VE/VEISelLowering.h +++ b/lib/Target/VE/VEISelLowering.h @@ -92,9 +92,9 @@ public: // VE uses release consistency, so need fence for each atomics. return true; } - Instruction *emitLeadingFence(IRBuilder<> &Builder, Instruction *Inst, + Instruction *emitLeadingFence(IRBuilderBase &Builder, Instruction *Inst, AtomicOrdering Ord) const override; - Instruction *emitTrailingFence(IRBuilder<> &Builder, Instruction *Inst, + Instruction *emitTrailingFence(IRBuilderBase &Builder, Instruction *Inst, AtomicOrdering Ord) const override; TargetLoweringBase::AtomicExpansionKind shouldExpandAtomicRMWInIR(AtomicRMWInst *AI) const override;