diff options
Diffstat (limited to 'llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp')
-rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp | 107 |
1 files changed, 53 insertions, 54 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp index bca3355df68..15df3d4ba06 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp @@ -49,22 +49,22 @@ class WebAssemblyFastISel final : public FastISel { // All possible address modes. class Address { public: - typedef enum { RegBase, FrameIndexBase } BaseKind; + using BaseKind = enum { RegBase, FrameIndexBase }; private: - BaseKind Kind; + BaseKind Kind = RegBase; union { unsigned Reg; int FI; } Base; - int64_t Offset; + int64_t Offset = 0; - const GlobalValue *GV; + const GlobalValue *GV = nullptr; public: // Innocuous defaults for our address. - Address() : Kind(RegBase), Offset(0), GV(0) { Base.Reg = 0; } + Address() { Base.Reg = 0; } void setKind(BaseKind K) { assert(!isSet() && "Can't change kind with non-zero base"); Kind = K; @@ -91,9 +91,9 @@ class WebAssemblyFastISel final : public FastISel { return Base.FI; } - void setOffset(int64_t Offset_) { - assert(Offset_ >= 0 && "Offsets must be non-negative"); - Offset = Offset_; + void setOffset(int64_t NewOffset) { + assert(NewOffset >= 0 && "Offsets must be non-negative"); + Offset = NewOffset; } int64_t getOffset() const { return Offset; } void setGlobalValue(const GlobalValue *G) { GV = G; } @@ -210,7 +210,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { const User *U = nullptr; unsigned Opcode = Instruction::UserOp1; - if (const Instruction *I = dyn_cast<Instruction>(Obj)) { + if (const auto *I = dyn_cast<Instruction>(Obj)) { // Don't walk into other basic blocks unless the object is an alloca from // another block, otherwise it may not have a virtual register assigned. if (FuncInfo.StaticAllocaMap.count(static_cast<const AllocaInst *>(Obj)) || @@ -218,7 +218,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { Opcode = I->getOpcode(); U = I; } - } else if (const ConstantExpr *C = dyn_cast<ConstantExpr>(Obj)) { + } else if (const auto *C = dyn_cast<ConstantExpr>(Obj)) { Opcode = C->getOpcode(); U = C; } @@ -229,7 +229,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { // address spaces. return false; - if (const GlobalValue *GV = dyn_cast<GlobalValue>(Obj)) { + if (const auto *GV = dyn_cast<GlobalValue>(Obj)) { if (Addr.getGlobalValue()) return false; Addr.setGlobalValue(GV); @@ -274,7 +274,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { } else { uint64_t S = DL.getTypeAllocSize(GTI.getIndexedType()); for (;;) { - if (const ConstantInt *CI = dyn_cast<ConstantInt>(Op)) { + if (const auto *CI = dyn_cast<ConstantInt>(Op)) { // Constant-offset addressing. TmpOffset += CI->getSExtValue() * S; break; @@ -289,8 +289,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { } if (canFoldAddIntoGEP(U, Op)) { // A compatible add with a constant operand. Fold the constant. - ConstantInt *CI = - cast<ConstantInt>(cast<AddOperator>(Op)->getOperand(1)); + auto *CI = cast<ConstantInt>(cast<AddOperator>(Op)->getOperand(1)); TmpOffset += CI->getSExtValue() * S; // Iterate on the other operand. Op = cast<AddOperator>(Op)->getOperand(0); @@ -314,7 +313,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { break; } case Instruction::Alloca: { - const AllocaInst *AI = cast<AllocaInst>(Obj); + const auto *AI = cast<AllocaInst>(Obj); DenseMap<const AllocaInst *, int>::iterator SI = FuncInfo.StaticAllocaMap.find(AI); if (SI != FuncInfo.StaticAllocaMap.end()) { @@ -335,7 +334,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { if (isa<ConstantInt>(LHS)) std::swap(LHS, RHS); - if (const ConstantInt *CI = dyn_cast<ConstantInt>(RHS)) { + if (const auto *CI = dyn_cast<ConstantInt>(RHS)) { uint64_t TmpOffset = Addr.getOffset() + CI->getSExtValue(); if (int64_t(TmpOffset) >= 0) { Addr.setOffset(TmpOffset); @@ -355,7 +354,7 @@ bool WebAssemblyFastISel::computeAddress(const Value *Obj, Address &Addr) { const Value *LHS = U->getOperand(0); const Value *RHS = U->getOperand(1); - if (const ConstantInt *CI = dyn_cast<ConstantInt>(RHS)) { + if (const auto *CI = dyn_cast<ConstantInt>(RHS)) { int64_t TmpOffset = Addr.getOffset() - CI->getSExtValue(); if (TmpOffset >= 0) { Addr.setOffset(TmpOffset); @@ -415,7 +414,7 @@ unsigned WebAssemblyFastISel::maskI1Value(unsigned Reg, const Value *V) { } unsigned WebAssemblyFastISel::getRegForI1Value(const Value *V, bool &Not) { - if (const ICmpInst *ICmp = dyn_cast<ICmpInst>(V)) + if (const auto *ICmp = dyn_cast<ICmpInst>(V)) if (const ConstantInt *C = dyn_cast<ConstantInt>(ICmp->getOperand(1))) if (ICmp->isEquality() && C->isZero() && C->getType()->isIntegerTy(32)) { Not = ICmp->isTrueWhenEqual(); @@ -605,7 +604,7 @@ unsigned WebAssemblyFastISel::fastMaterializeAlloca(const AllocaInst *AI) { } unsigned WebAssemblyFastISel::fastMaterializeConstant(const Constant *C) { - if (const GlobalValue *GV = dyn_cast<GlobalValue>(C)) { + if (const auto *GV = dyn_cast<GlobalValue>(C)) { unsigned ResultReg = createResultReg(Subtarget->hasAddr64() ? &WebAssembly::I64RegClass : &WebAssembly::I32RegClass); @@ -628,14 +627,14 @@ bool WebAssemblyFastISel::fastLowerArguments() { if (F->isVarArg()) return false; - unsigned i = 0; + unsigned I = 0; for (auto const &Arg : F->args()) { const AttributeList &Attrs = F->getAttributes(); - if (Attrs.hasParamAttribute(i, Attribute::ByVal) || - Attrs.hasParamAttribute(i, Attribute::SwiftSelf) || - Attrs.hasParamAttribute(i, Attribute::SwiftError) || - Attrs.hasParamAttribute(i, Attribute::InAlloca) || - Attrs.hasParamAttribute(i, Attribute::Nest)) + if (Attrs.hasParamAttribute(I, Attribute::ByVal) || + Attrs.hasParamAttribute(I, Attribute::SwiftSelf) || + Attrs.hasParamAttribute(I, Attribute::SwiftError) || + Attrs.hasParamAttribute(I, Attribute::InAlloca) || + Attrs.hasParamAttribute(I, Attribute::Nest)) return false; Type *ArgTy = Arg.getType(); @@ -699,10 +698,10 @@ bool WebAssemblyFastISel::fastLowerArguments() { } unsigned ResultReg = createResultReg(RC); BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DbgLoc, TII.get(Opc), ResultReg) - .addImm(i); + .addImm(I); updateValueMap(&Arg, ResultReg); - ++i; + ++I; } MRI.addLiveIn(WebAssembly::ARGUMENTS); @@ -731,7 +730,7 @@ bool WebAssemblyFastISel::fastLowerArguments() { } bool WebAssemblyFastISel::selectCall(const Instruction *I) { - const CallInst *Call = cast<CallInst>(I); + const auto *Call = cast<CallInst>(I); if (Call->isMustTailCall() || Call->isInlineAsm() || Call->getFunctionType()->isVarArg()) @@ -817,25 +816,25 @@ bool WebAssemblyFastISel::selectCall(const Instruction *I) { } SmallVector<unsigned, 8> Args; - for (unsigned i = 0, e = Call->getNumArgOperands(); i < e; ++i) { - Value *V = Call->getArgOperand(i); + for (unsigned I = 0, E = Call->getNumArgOperands(); I < E; ++I) { + Value *V = Call->getArgOperand(I); MVT::SimpleValueType ArgTy = getSimpleType(V->getType()); if (ArgTy == MVT::INVALID_SIMPLE_VALUE_TYPE) return false; const AttributeList &Attrs = Call->getAttributes(); - if (Attrs.hasParamAttribute(i, Attribute::ByVal) || - Attrs.hasParamAttribute(i, Attribute::SwiftSelf) || - Attrs.hasParamAttribute(i, Attribute::SwiftError) || - Attrs.hasParamAttribute(i, Attribute::InAlloca) || - Attrs.hasParamAttribute(i, Attribute::Nest)) + if (Attrs.hasParamAttribute(I, Attribute::ByVal) || + Attrs.hasParamAttribute(I, Attribute::SwiftSelf) || + Attrs.hasParamAttribute(I, Attribute::SwiftError) || + Attrs.hasParamAttribute(I, Attribute::InAlloca) || + Attrs.hasParamAttribute(I, Attribute::Nest)) return false; unsigned Reg; - if (Attrs.hasParamAttribute(i, Attribute::SExt)) + if (Attrs.hasParamAttribute(I, Attribute::SExt)) Reg = getRegForSignedValue(V); - else if (Attrs.hasParamAttribute(i, Attribute::ZExt)) + else if (Attrs.hasParamAttribute(I, Attribute::ZExt)) Reg = getRegForUnsignedValue(V); else Reg = getRegForValue(V); @@ -869,7 +868,7 @@ bool WebAssemblyFastISel::selectCall(const Instruction *I) { } bool WebAssemblyFastISel::selectSelect(const Instruction *I) { - const SelectInst *Select = cast<SelectInst>(I); + const auto *Select = cast<SelectInst>(I); bool Not; unsigned CondReg = getRegForI1Value(Select->getCondition(), Not); @@ -928,7 +927,7 @@ bool WebAssemblyFastISel::selectSelect(const Instruction *I) { } bool WebAssemblyFastISel::selectTrunc(const Instruction *I) { - const TruncInst *Trunc = cast<TruncInst>(I); + const auto *Trunc = cast<TruncInst>(I); unsigned Reg = getRegForValue(Trunc->getOperand(0)); if (Reg == 0) @@ -947,7 +946,7 @@ bool WebAssemblyFastISel::selectTrunc(const Instruction *I) { } bool WebAssemblyFastISel::selectZExt(const Instruction *I) { - const ZExtInst *ZExt = cast<ZExtInst>(I); + const auto *ZExt = cast<ZExtInst>(I); const Value *Op = ZExt->getOperand(0); MVT::SimpleValueType From = getSimpleType(Op->getType()); @@ -964,7 +963,7 @@ bool WebAssemblyFastISel::selectZExt(const Instruction *I) { } bool WebAssemblyFastISel::selectSExt(const Instruction *I) { - const SExtInst *SExt = cast<SExtInst>(I); + const auto *SExt = cast<SExtInst>(I); const Value *Op = SExt->getOperand(0); MVT::SimpleValueType From = getSimpleType(Op->getType()); @@ -981,11 +980,11 @@ bool WebAssemblyFastISel::selectSExt(const Instruction *I) { } bool WebAssemblyFastISel::selectICmp(const Instruction *I) { - const ICmpInst *ICmp = cast<ICmpInst>(I); + const auto *ICmp = cast<ICmpInst>(I); bool I32 = getSimpleType(ICmp->getOperand(0)->getType()) != MVT::i64; unsigned Opc; - bool isSigned = false; + bool IsSigned = false; switch (ICmp->getPredicate()) { case ICmpInst::ICMP_EQ: Opc = I32 ? WebAssembly::EQ_I32 : WebAssembly::EQ_I64; @@ -1007,29 +1006,29 @@ bool WebAssemblyFastISel::selectICmp(const Instruction *I) { break; case ICmpInst::ICMP_SGT: Opc = I32 ? WebAssembly::GT_S_I32 : WebAssembly::GT_S_I64; - isSigned = true; + IsSigned = true; break; case ICmpInst::ICMP_SGE: Opc = I32 ? WebAssembly::GE_S_I32 : WebAssembly::GE_S_I64; - isSigned = true; + IsSigned = true; break; case ICmpInst::ICMP_SLT: Opc = I32 ? WebAssembly::LT_S_I32 : WebAssembly::LT_S_I64; - isSigned = true; + IsSigned = true; break; case ICmpInst::ICMP_SLE: Opc = I32 ? WebAssembly::LE_S_I32 : WebAssembly::LE_S_I64; - isSigned = true; + IsSigned = true; break; default: return false; } - unsigned LHS = getRegForPromotedValue(ICmp->getOperand(0), isSigned); + unsigned LHS = getRegForPromotedValue(ICmp->getOperand(0), IsSigned); if (LHS == 0) return false; - unsigned RHS = getRegForPromotedValue(ICmp->getOperand(1), isSigned); + unsigned RHS = getRegForPromotedValue(ICmp->getOperand(1), IsSigned); if (RHS == 0) return false; @@ -1042,7 +1041,7 @@ bool WebAssemblyFastISel::selectICmp(const Instruction *I) { } bool WebAssemblyFastISel::selectFCmp(const Instruction *I) { - const FCmpInst *FCmp = cast<FCmpInst>(I); + const auto *FCmp = cast<FCmpInst>(I); unsigned LHS = getRegForValue(FCmp->getOperand(0)); if (LHS == 0) @@ -1138,7 +1137,7 @@ bool WebAssemblyFastISel::selectBitCast(const Instruction *I) { } bool WebAssemblyFastISel::selectLoad(const Instruction *I) { - const LoadInst *Load = cast<LoadInst>(I); + const auto *Load = cast<LoadInst>(I); if (Load->isAtomic()) return false; if (!Subtarget->hasSIMD128() && Load->getType()->isVectorTy()) @@ -1195,7 +1194,7 @@ bool WebAssemblyFastISel::selectLoad(const Instruction *I) { } bool WebAssemblyFastISel::selectStore(const Instruction *I) { - const StoreInst *Store = cast<StoreInst>(I); + const auto *Store = cast<StoreInst>(I); if (Store->isAtomic()) return false; if (!Subtarget->hasSIMD128() && @@ -1251,7 +1250,7 @@ bool WebAssemblyFastISel::selectStore(const Instruction *I) { } bool WebAssemblyFastISel::selectBr(const Instruction *I) { - const BranchInst *Br = cast<BranchInst>(I); + const auto *Br = cast<BranchInst>(I); if (Br->isUnconditional()) { MachineBasicBlock *MSucc = FuncInfo.MBBMap[Br->getSuccessor(0)]; fastEmitBranch(MSucc, Br->getDebugLoc()); @@ -1282,7 +1281,7 @@ bool WebAssemblyFastISel::selectRet(const Instruction *I) { if (!FuncInfo.CanLowerReturn) return false; - const ReturnInst *Ret = cast<ReturnInst>(I); + const auto *Ret = cast<ReturnInst>(I); if (Ret->getNumOperands() == 0) { BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DbgLoc, |