Merge commit 'cfe09ed28d8a65b671e8b7a716a933e98e810e32'

Conflicts:
	lib/Target/ARM/ARMFrameLowering.cpp
	lib/Target/Mips/MipsRegisterInfo.cpp
	lib/Target/X86/X86ISelLowering.cpp
	lib/Transforms/IPO/ExtractGV.cpp
	tools/Makefile
	tools/gold/gold-plugin.cpp

The only interesting conflict was X86ISelLowering.ccp, which
meant I had to essentially revert r167104. The problem is that we are
using ESP as the stack pointer in X86ISelLowering and RSP as the
stack pointer in X86FrameLowering, and that revision made them
both consistently use X86RegisterInfo to determine which to use.

1 files changed, 1 insertions, 8 deletions

diff --git a/lib/Analysis/ProfileDataLoader.cpp b/lib/Analysis/ProfileDataLoader.cpp
index 69286efb3c..a4f634af53 100644
--- a/lib/Analysis/ProfileDataLoader.cpp
+++ b/lib/Analysis/ProfileDataLoader.cpp
@@ -51,13 +51,7 @@ static unsigned AddCounts(unsigned A, unsigned B) {
   if (A == ProfileDataLoader::Uncounted) return B;
   if (B == ProfileDataLoader::Uncounted) return A;
 
-  // Saturate to the maximum storable value.  This could change taken/nottaken
-  // ratios, but is presumably better than wrapping and thus potentially
-  // inverting ratios.
-  uint64_t tmp = (uint64_t)A + (uint64_t)B;
-  if (tmp > (uint64_t)ProfileDataLoader::MaxCount)
-    tmp = ProfileDataLoader::MaxCount;
-  return (unsigned)tmp;
+  return A + B;
 }
 
 /// ReadProfilingData - Load 'NumEntries' items of type 'T' from file 'F'
@@ -120,7 +114,6 @@ static void ReadProfilingArgBlock(const char *ToolName, FILE *F,
 }
 
 const unsigned ProfileDataLoader::Uncounted = ~0U;
-const unsigned ProfileDataLoader::MaxCount = ~0U - 1U;
 
 /// ProfileDataLoader ctor - Read the specified profiling data file, reporting
 /// a fatal error if the file is invalid or broken.