diff --git a/lib/CodeGen/GlobalISel/LegalizerHelper.cpp b/lib/CodeGen/GlobalISel/LegalizerHelper.cpp index 6a34a3111fc..cd5419f323a 100644 --- a/lib/CodeGen/GlobalISel/LegalizerHelper.cpp +++ b/lib/CodeGen/GlobalISel/LegalizerHelper.cpp @@ -327,13 +327,11 @@ LLT LegalizerHelper::buildLCMMergePieces(LLT DstTy, LLT NarrowTy, LLT GCDTy, } // Registers for the final merge to be produced. - SmallVector Remerge; - Remerge.resize(NumParts); + SmallVector Remerge(NumParts); // Registers needed for intermediate merges, which will be merged into a // source for Remerge. - SmallVector SubMerge; - SubMerge.resize(NumSubParts); + SmallVector SubMerge(NumSubParts); // Once we've fully read off the end of the original source bits, we can reuse // the same high bits for remaining padding elements. @@ -1055,10 +1053,8 @@ LegalizerHelper::LegalizeResult LegalizerHelper::narrowScalar(MachineInstr &MI, return Legalized; case TargetOpcode::G_PHI: { unsigned NumParts = SizeOp0 / NarrowSize; - SmallVector DstRegs; - SmallVector, 2> SrcRegs; - DstRegs.resize(NumParts); - SrcRegs.resize(MI.getNumOperands() / 2); + SmallVector DstRegs(NumParts); + SmallVector, 2> SrcRegs(MI.getNumOperands() / 2); Observer.changingInstr(MI); for (unsigned i = 1; i < MI.getNumOperands(); i += 2) { MachineBasicBlock &OpMBB = *MI.getOperand(i + 1).getMBB(); @@ -3723,10 +3719,10 @@ LegalizerHelper::narrowScalarMul(MachineInstr &MI, LLT NarrowTy) { bool IsMulHigh = MI.getOpcode() == TargetOpcode::G_UMULH; unsigned DstTmpParts = NumDstParts * (IsMulHigh ? 2 : 1); - SmallVector Src1Parts, Src2Parts, DstTmpRegs; + SmallVector Src1Parts, Src2Parts; + SmallVector DstTmpRegs(DstTmpParts); extractParts(Src1, NarrowTy, NumSrcParts, Src1Parts); extractParts(Src2, NarrowTy, NumSrcParts, Src2Parts); - DstTmpRegs.resize(DstTmpParts); multiplyRegisters(DstTmpRegs, Src1Parts, Src2Parts, NarrowTy); // Take only high half of registers if this is high mul.