diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 27931e118504b9..10736305762d21 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -630,8 +630,7 @@ static void finishCallSiteParams(ValT Val, const DIExpression *Expr, static void addToFwdRegWorklist(FwdRegWorklist &Worklist, unsigned Reg, const DIExpression *Expr, ArrayRef ParamsToAdd) { - auto I = Worklist.insert({Reg, {}}); - auto &ParamsForFwdReg = I.first->second; + auto &ParamsForFwdReg = Worklist[Reg]; for (auto Param : ParamsToAdd) { assert(none_of(ParamsForFwdReg, [Param](const FwdRegParamInfo &D) { diff --git a/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp b/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp index 6a6bc19314d5b6..374f23099a9080 100644 --- a/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp @@ -120,8 +120,7 @@ void FunctionLoweringInfo::set(const Function &fn, MachineFunction &mf, for (WinEHTryBlockMapEntry &TBME : EHInfo.TryBlockMap) { for (WinEHHandlerType &H : TBME.HandlerArray) { if (const AllocaInst *AI = H.CatchObj.Alloca) - CatchObjects.insert({AI, {}}).first->second.push_back( - &H.CatchObj.FrameIndex); + CatchObjects[AI].push_back(&H.CatchObj.FrameIndex); else H.CatchObj.FrameIndex = INT_MAX; }