[compiler-rt][InstrProf] unify the calculation of section bytes and entry counts

Author: whentojump

compiler-rt/lib/profile/InstrProfilingBuffer.c

@@ -67,14 +67,13 @@ COMPILER_RT_VISIBILITY
 uint64_t __llvm_profile_get_num_data(const __llvm_profile_data *Begin,
                                      const __llvm_profile_data *End) {
   intptr_t BeginI = (intptr_t)Begin, EndI = (intptr_t)End;
-  return ((EndI + sizeof(__llvm_profile_data) - 1) - BeginI) /
-         sizeof(__llvm_profile_data);
+  return (EndI - BeginI) / sizeof(__llvm_profile_data);
 }
 
 COMPILER_RT_VISIBILITY
 uint64_t __llvm_profile_get_data_size(const __llvm_profile_data *Begin,
                                       const __llvm_profile_data *End) {
-  return __llvm_profile_get_num_data(Begin, End) * sizeof(__llvm_profile_data);
+  return (intptr_t)(End) - (intptr_t)(Begin);
 }
 
 // Counts the number of `VTableProfData` elements within the range of [Begin,
@@ -106,25 +105,23 @@ COMPILER_RT_VISIBILITY size_t __llvm_profile_counter_entry_size(void) {
 COMPILER_RT_VISIBILITY
 uint64_t __llvm_profile_get_num_counters(const char *Begin, const char *End) {
   intptr_t BeginI = (intptr_t)Begin, EndI = (intptr_t)End;
-  return ((EndI + __llvm_profile_counter_entry_size() - 1) - BeginI) /
-         __llvm_profile_counter_entry_size();
+  return (EndI - BeginI) / __llvm_profile_counter_entry_size();
 }
 
 COMPILER_RT_VISIBILITY
 uint64_t __llvm_profile_get_counters_size(const char *Begin, const char *End) {
-  return __llvm_profile_get_num_counters(Begin, End) *
-         __llvm_profile_counter_entry_size();
+  return (intptr_t)(End) - (intptr_t)(Begin);
 }
 
 COMPILER_RT_VISIBILITY
 uint64_t __llvm_profile_get_num_bitmap_bytes(const char *Begin,
                                              const char *End) {
-  return (End - Begin);
+  return (intptr_t)(End) - (intptr_t)(Begin);
 }
 
 COMPILER_RT_VISIBILITY
 uint64_t __llvm_profile_get_name_size(const char *Begin, const char *End) {
-  return End - Begin;
+  return (intptr_t)(End) - (intptr_t)(Begin);
 }
 
 /// Calculate the number of padding bytes needed to add to \p Offset in order