X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FProfileInfoLoader.cpp;h=25481b2ee671ea30064b1af2c214bf55e559605d;hb=2491ce03535cf8ec171570d2e28df63e4db3dd6b;hp=5ca2e3015f91c3d6352711c18febb631c0fd97df;hpb=da5ea945545ca8864a873a5a33fd891ec381ec88;p=oota-llvm.git

diff --git a/lib/Analysis/ProfileInfoLoader.cpp b/lib/Analysis/ProfileInfoLoader.cpp
index 5ca2e3015f9..25481b2ee67 100644
--- a/lib/Analysis/ProfileInfoLoader.cpp
+++ b/lib/Analysis/ProfileInfoLoader.cpp
@@ -26,10 +26,17 @@ using namespace llvm;
 //
 static inline unsigned ByteSwap(unsigned Var, bool Really) {
   if (!Really) return Var;
-  return ((Var & (255<< 0)) << 24) |
-         ((Var & (255<< 8)) <<  8) |
-         ((Var & (255<<16)) >>  8) |
-         ((Var & (255<<24)) >> 24);
+  return ((Var & (255U<< 0U)) << 24U) |
+         ((Var & (255U<< 8U)) <<  8U) |
+         ((Var & (255U<<16U)) >>  8U) |
+         ((Var & (255U<<24U)) >> 24U);
+}
+
+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;
+  return A + B;
 }
 
 static void ReadProfilingBlock(const char *ToolName, FILE *F,
@@ -57,34 +64,22 @@ static void ReadProfilingBlock(const char *ToolName, FILE *F,
   // 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, -1);
+    Data.resize(NumEntries, ProfileInfoLoader::Uncounted);
 
   // Accumulate the data we just read into the data.
   if (!ShouldByteSwap) {
     for (unsigned i = 0; i != NumEntries; ++i) {
-      unsigned data = TempSpace[i];
-      if (data != (unsigned)-1) {       // only load data if its not MissingVal
-        if (Data[i] == (unsigned)-1) {
-          Data[i] = data;               // if data is still initialised
-        } else {
-          Data[i] += data;
-        }
-      }
+      Data[i] = AddCounts(TempSpace[i], Data[i]);
     }
   } else {
     for (unsigned i = 0; i != NumEntries; ++i) {
-      unsigned data = ByteSwap(TempSpace[i], true);
-      if (data != (unsigned)-1) {       // only load data if its not MissingVal
-        if (Data[i] == (unsigned)-1) {
-          Data[i] = data;
-        } else {
-          Data[i] += data;
-        }
-      }
+      Data[i] = AddCounts(ByteSwap(TempSpace[i], true), Data[i]);
     }
   }
 }
 
+const unsigned ProfileInfoLoader::Uncounted = ~0U;
+
 // ProfileInfoLoader ctor - Read the specified profiling data file, exiting the
 // program if the file is invalid or broken.
 //