@@ -1149,10 +1149,8 @@ void CGOpenMPRuntime::emitUserDefinedReduction(
1149
1149
/*IsCombiner=*/false);
1150
1150
}
1151
1151
UDRMap.try_emplace(D, Combiner, Initializer);
1152
- if (CGF) {
1153
- auto &Decls = FunctionUDRMap.FindAndConstruct(CGF->CurFn);
1154
- Decls.second.push_back(D);
1155
- }
1152
+ if (CGF)
1153
+ FunctionUDRMap[CGF->CurFn].push_back(D);
1156
1154
}
1157
1155
1158
1156
std::pair<llvm::Function *, llvm::Function *>
@@ -1432,10 +1430,8 @@ llvm::Value *CGOpenMPRuntime::getThreadID(CodeGenFunction &CGF,
1432
1430
ThreadID = CGF.EmitLoadOfScalar(LVal, Loc);
1433
1431
// If value loaded in entry block, cache it and use it everywhere in
1434
1432
// function.
1435
- if (CGF.Builder.GetInsertBlock() == TopBlock) {
1436
- auto &Elem = OpenMPLocThreadIDMap.FindAndConstruct(CGF.CurFn);
1437
- Elem.second.ThreadID = ThreadID;
1438
- }
1433
+ if (CGF.Builder.GetInsertBlock() == TopBlock)
1434
+ OpenMPLocThreadIDMap[CGF.CurFn].ThreadID = ThreadID;
1439
1435
return ThreadID;
1440
1436
}
1441
1437
}
@@ -8640,8 +8636,7 @@ class MappableExprsHandler {
8640
8636
const MapData &BaseData = CI == CE ? L : L1;
8641
8637
OMPClauseMappableExprCommon::MappableExprComponentListRef SubData =
8642
8638
SI == SE ? Components : Components1;
8643
- auto &OverlappedElements = OverlappedData.FindAndConstruct(&BaseData);
8644
- OverlappedElements.getSecond().push_back(SubData);
8639
+ OverlappedData[&BaseData].push_back(SubData);
8645
8640
}
8646
8641
}
8647
8642
}
@@ -9316,10 +9311,8 @@ void CGOpenMPRuntime::emitUserDefinedMapper(const OMPDeclareMapperDecl *D,
9316
9311
MapperCGF.EmitBlock(DoneBB, /*IsFinished=*/true);
9317
9312
MapperCGF.FinishFunction();
9318
9313
UDMMap.try_emplace(D, Fn);
9319
- if (CGF) {
9320
- auto &Decls = FunctionUDMMap.FindAndConstruct(CGF->CurFn);
9321
- Decls.second.push_back(D);
9322
- }
9314
+ if (CGF)
9315
+ FunctionUDMMap[CGF->CurFn].push_back(D);
9323
9316
}
9324
9317
9325
9318
/// Emit the array initialization or deletion portion for user-defined mapper
0 commit comments