Sync InstrProfData.inc between llvm and compiler-rt

[ellis]

Summary

Fix difference in InstrProfData.inc between llvm and compiler-rt.

My understanding is that
llvm/include/llvm/ProfileData/InstrProfData.inc and
compiler-rt/include/profile/InstrProfData.inc need to stay identical.

diff llvm/include/llvm/ProfileData/InstrProfData.inc compiler-rt/include/profile/InstrProfData.inc

[lanza]

The comment at the top says this is the master but this def seems right. @MaskRay did the compiler-rt change so I'll just tag him in.

[davidxl]

lgtm

[ellis]

Thanks for accepting @davidxl
Would you mind landing this? I don't have commit access.

llvm/include/llvm/ProfileData/InstrProfData.inc

 /* InstrProfile per-function control data alignment.  */
 #define INSTR_PROF_DATA_ALIGNMENT 8
 
 /* The data structure that represents a tracked value by the
  * value profiler.
  */
 typedef struct InstrProfValueData {
   /* Profiled value. */
   uint64_t Value;
   /* Number of times the value appears in the training run. */
   uint64_t Count;
 } InstrProfValueData;
 
 #endif /* INSTR_PROF_DATA_INC */
 
 #ifndef INSTR_ORDER_FILE_INC
 /* The maximal # of functions: 128*1024 (the buffer size will be 128*4 KB). */
 #define INSTR_ORDER_FILE_BUFFER_SIZE 131072
 #define INSTR_ORDER_FILE_BUFFER_BITS 17
InstrProfGetRangeRepValue(uint64_t Value) {
   else if (Value >= 513)
     // The last range is mapped to its lowest value.
     return 513;
   else if (InstProfPopcountll(Value) == 1)
     // If it's a power of two, use it as is.
     return Value;
   else
     // Otherwise, take to the previous power of two + 1.
-    return (1 << (64 - InstProfClzll(Value) - 1)) + 1;
+    return (UINT64_C(1) << (64 - InstProfClzll(Value) - 1)) + 1;
 }
 
 /* Return true if the range that an (observed) memop size value belongs to has
  * only a single value in the range.  For example, 0 -> true, 8 -> true, 10 ->
  * false, 64 -> true, 100 -> false, 513 -> false. */
 INSTR_PROF_VISIBILITY INSTR_PROF_INLINE unsigned
 InstrProfIsSingleValRange(uint64_t Value) {
   if (Value <= 8)