};
}
-static std::error_code combineInstrProfRecords(InstrProfRecord &Dest,
- InstrProfRecord &Source,
- uint64_t &MaxFunctionCount) {
- // If the number of counters doesn't match we either have bad data
- // or a hash collision.
- if (Dest.Counts.size() != Source.Counts.size())
- return instrprof_error::count_mismatch;
-
- for (size_t I = 0, E = Source.Counts.size(); I < E; ++I) {
- if (Dest.Counts[I] + Source.Counts[I] < Dest.Counts[I])
- return instrprof_error::counter_overflow;
- Dest.Counts[I] += Source.Counts[I];
- }
-
- for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; ++Kind) {
- if (std::error_code EC = Dest.mergeValueProfData(Kind, Source))
- return EC;
- }
-
- // We keep track of the max function count as we go for simplicity.
- if (Dest.Counts[0] > MaxFunctionCount)
- MaxFunctionCount = Dest.Counts[0];
-
- return instrprof_error::success;
-}
-
// Internal interface for testing purpose only.
void InstrProfWriter::setValueProfDataEndianness(
support::endianness Endianness) {
updateStringTableReferences(I);
auto &ProfileDataMap = FunctionData[I.Name];
- auto Where = ProfileDataMap.find(I.Hash);
- if (Where == ProfileDataMap.end()) {
+ bool NewFunc;
+ ProfilingData::iterator Where;
+ std::tie(Where, NewFunc) =
+ ProfileDataMap.insert(std::make_pair(I.Hash, InstrProfRecord()));
+ InstrProfRecord &Dest = Where->second;
+ if (NewFunc) {
// We've never seen a function with this name and hash, add it.
- ProfileDataMap[I.Hash] = I;
-
- // We keep track of the max function count as we go for simplicity.
- if (I.Counts[0] > MaxFunctionCount)
- MaxFunctionCount = I.Counts[0];
- return instrprof_error::success;
+ Dest = std::move(I);
+ } else {
+ // We're updating a function we've seen before.
+ instrprof_error MergeResult = Dest.merge(I);
+ if (MergeResult != instrprof_error::success) {
+ return MergeResult;
+ }
}
- // We're updating a function we've seen before.
- return combineInstrProfRecords(Where->second, I, MaxFunctionCount);
+ // We keep track of the max function count as we go for simplicity.
+ if (Dest.Counts[0] > MaxFunctionCount)
+ MaxFunctionCount = Dest.Counts[0];
+
+ return instrprof_error::success;
}
std::pair<uint64_t, uint64_t> InstrProfWriter::writeImpl(raw_ostream &OS) {