revert r81335, which breaks the build.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81347 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/ProfileInfoLoader.cpp b/lib/Analysis/ProfileInfoLoader.cpp
index 4b38e87..a6c55df 100644
--- a/lib/Analysis/ProfileInfoLoader.cpp
+++ b/lib/Analysis/ProfileInfoLoader.cpp
@@ -34,8 +34,8 @@
static unsigned AddCounts(unsigned A, unsigned B) {
// If either value is undefined, use the other.
- if (A == ProfileInfoLoader::Uncounted) return B;
- if (B == ProfileInfoLoader::Uncounted) return A;
+ if (A == ~0U) return B;
+ if (B == ~0U) return A;
return A + B;
}
@@ -64,7 +64,7 @@
// Make sure we have enough space... The space is initialised to -1 to
// facitiltate the loading of missing values for OptimalEdgeProfiling.
if (Data.size() < NumEntries)
- Data.resize(NumEntries, ProfileInfoLoader::Uncounted);
+ Data.resize(NumEntries, ~0U);
// Accumulate the data we just read into the data.
if (!ShouldByteSwap) {
diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp
index 4694d01..e79dd8c 100644
--- a/lib/Analysis/ProfileInfoLoaderPass.cpp
+++ b/lib/Analysis/ProfileInfoLoaderPass.cpp
@@ -159,12 +159,8 @@
void LoaderPass::readOrRememberEdge(ProfileInfo::Edge e,
unsigned weight, unsigned ei,
Function *F) {
- if (weight != ProfileInfoLoader::Uncounted) {
- // Here the data realm changes from the unsigned of the file to the double
- // of the ProfileInfo. This conversion is save because we know that
- // everything thats representable in unsinged is also representable in
- // double.
- EdgeInformation[F][e] += (double)weight;
+ if (weight != ~0U) {
+ EdgeInformation[F][e] += weight;
DEBUG(errs()<<"--Read Edge Counter for " << e
<<" (# "<<ei<<"): "<<(unsigned)getEdgeWeight(e)<<"\n");
} else {
@@ -182,12 +178,8 @@
for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F) {
if (F->isDeclaration()) continue;
if (ei < ECs.size())
- // Here the data realm changes from the unsigned of the file to the
- // double of the ProfileInfo. This conversion is save because we know
- // that everything thats representable in unsinged is also
- // representable in double.
EdgeInformation[F][ProfileInfo::getEdge(0, &F->getEntryBlock())] +=
- (double)ECs[ei++];
+ ECs[ei++];
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
// Okay, we have to add a counter of each outgoing edge. If the
// outgoing edge is not critical don't split it, just insert the counter
@@ -195,10 +187,8 @@
TerminatorInst *TI = BB->getTerminator();
for (unsigned s = 0, e = TI->getNumSuccessors(); s != e; ++s) {
if (ei < ECs.size())
- // Here the data realm changes from the unsigned of the file to
- // the double of the ProfileInfo.
EdgeInformation[F][ProfileInfo::getEdge(BB, TI->getSuccessor(s))] +=
- (double)ECs[ei++];
+ ECs[ei++];
}
}
}
@@ -274,11 +264,7 @@
if (F->isDeclaration()) continue;
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB)
if (bi < BCs.size())
- // Here the data realm changes from the unsigned of the file to the
- // double of the ProfileInfo. This conversion is save because we know
- // that everything thats representable in unsinged is also
- // representable in double.
- BlockInformation[F][BB] = (double)BCs[bi++];
+ BlockInformation[F][BB] = BCs[bi++];
}
if (bi != BCs.size()) {
errs() << "WARNING: profile information is inconsistent with "
@@ -293,11 +279,7 @@
for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F) {
if (F->isDeclaration()) continue;
if (fi < FCs.size())
- // Here the data realm changes from the unsigned of the file to the
- // double of the ProfileInfo. This conversion is save because we know
- // that everything thats representable in unsinged is also
- // representable in double.
- FunctionInformation[F] = (double)FCs[fi++];
+ FunctionInformation[F] = FCs[fi++];
}
if (fi != FCs.size()) {
errs() << "WARNING: profile information is inconsistent with "