diff options
author | Justin Bogner <mail@justinbogner.com> | 2014-09-04 15:45:31 +0000 |
---|---|---|
committer | Justin Bogner <mail@justinbogner.com> | 2014-09-04 15:45:31 +0000 |
commit | 88c36887e0adec160d5a21c27bf5b9425a7d7f35 (patch) | |
tree | 7cce5f08e92927ccf2436785f83a1e46f4498c81 /lib/profile | |
parent | 3c96c1e527878ad7d5222ad6a18fe16a29b7e775 (diff) |
profile: Avoid name collisions between instrumentation and runtime
The naming scheme we're using for counters in profile data shares a
prefix with some fixed names we use for the runtime, notably
__llvm_profile_data_begin and _end. Embarrassingly, this means a
function called begin() can't be instrumented.
This modifies the runtime names so as not to collide with the
instrumentation.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@217166 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/profile')
-rw-r--r-- | lib/profile/InstrProfiling.c | 4 | ||||
-rw-r--r-- | lib/profile/InstrProfiling.h | 14 | ||||
-rw-r--r-- | lib/profile/InstrProfilingBuffer.c | 12 | ||||
-rw-r--r-- | lib/profile/InstrProfilingFile.c | 12 | ||||
-rw-r--r-- | lib/profile/InstrProfilingPlatformDarwin.c | 12 | ||||
-rw-r--r-- | lib/profile/InstrProfilingPlatformOther.c | 12 |
6 files changed, 33 insertions, 33 deletions
diff --git a/lib/profile/InstrProfiling.c b/lib/profile/InstrProfiling.c index aeb3681aa..8d010df28 100644 --- a/lib/profile/InstrProfiling.c +++ b/lib/profile/InstrProfiling.c @@ -41,8 +41,8 @@ uint64_t __llvm_profile_get_version(void) { __attribute__((visibility("hidden"))) void __llvm_profile_reset_counters(void) { - uint64_t *I = __llvm_profile_counters_begin(); - uint64_t *E = __llvm_profile_counters_end(); + uint64_t *I = __llvm_profile_begin_counters(); + uint64_t *E = __llvm_profile_end_counters(); memset(I, 0, sizeof(uint64_t)*(E - I)); } diff --git a/lib/profile/InstrProfiling.h b/lib/profile/InstrProfiling.h index c5dd641fc..a086f3d44 100644 --- a/lib/profile/InstrProfiling.h +++ b/lib/profile/InstrProfiling.h @@ -50,15 +50,15 @@ uint64_t __llvm_profile_get_size_for_buffer(void); */ int __llvm_profile_write_buffer(char *Buffer); -const __llvm_profile_data *__llvm_profile_data_begin(void); -const __llvm_profile_data *__llvm_profile_data_end(void); -const char *__llvm_profile_names_begin(void); -const char *__llvm_profile_names_end(void); -uint64_t *__llvm_profile_counters_begin(void); -uint64_t *__llvm_profile_counters_end(void); +const __llvm_profile_data *__llvm_profile_begin_data(void); +const __llvm_profile_data *__llvm_profile_end_data(void); +const char *__llvm_profile_begin_names(void); +const char *__llvm_profile_end_names(void); +uint64_t *__llvm_profile_begin_counters(void); +uint64_t *__llvm_profile_end_counters(void); #define PROFILE_RANGE_SIZE(Range) \ - (__llvm_profile_ ## Range ## _end() - __llvm_profile_ ## Range ## _begin()) + (__llvm_profile_end_ ## Range () - __llvm_profile_begin_ ## Range ()) /*! * \brief Write instrumentation data to the current file. diff --git a/lib/profile/InstrProfilingBuffer.c b/lib/profile/InstrProfilingBuffer.c index b53d4f795..3351b07ba 100644 --- a/lib/profile/InstrProfilingBuffer.c +++ b/lib/profile/InstrProfilingBuffer.c @@ -26,12 +26,12 @@ int __llvm_profile_write_buffer(char *Buffer) { /* Match logic in __llvm_profile_get_size_for_buffer(). * Match logic in __llvm_profile_write_file(). */ - const __llvm_profile_data *DataBegin = __llvm_profile_data_begin(); - const __llvm_profile_data *DataEnd = __llvm_profile_data_end(); - const uint64_t *CountersBegin = __llvm_profile_counters_begin(); - const uint64_t *CountersEnd = __llvm_profile_counters_end(); - const char *NamesBegin = __llvm_profile_names_begin(); - const char *NamesEnd = __llvm_profile_names_end(); + const __llvm_profile_data *DataBegin = __llvm_profile_begin_data(); + const __llvm_profile_data *DataEnd = __llvm_profile_end_data(); + const uint64_t *CountersBegin = __llvm_profile_begin_counters(); + const uint64_t *CountersEnd = __llvm_profile_end_counters(); + const char *NamesBegin = __llvm_profile_begin_names(); + const char *NamesEnd = __llvm_profile_end_names(); /* Calculate size of sections. */ const uint64_t DataSize = DataEnd - DataBegin; diff --git a/lib/profile/InstrProfilingFile.c b/lib/profile/InstrProfilingFile.c index 5fb78e3f9..5aef3904b 100644 --- a/lib/profile/InstrProfilingFile.c +++ b/lib/profile/InstrProfilingFile.c @@ -16,12 +16,12 @@ static int writeFile(FILE *File) { /* Match logic in __llvm_profile_write_buffer(). */ - const __llvm_profile_data *DataBegin = __llvm_profile_data_begin(); - const __llvm_profile_data *DataEnd = __llvm_profile_data_end(); - const uint64_t *CountersBegin = __llvm_profile_counters_begin(); - const uint64_t *CountersEnd = __llvm_profile_counters_end(); - const char *NamesBegin = __llvm_profile_names_begin(); - const char *NamesEnd = __llvm_profile_names_end(); + const __llvm_profile_data *DataBegin = __llvm_profile_begin_data(); + const __llvm_profile_data *DataEnd = __llvm_profile_end_data(); + const uint64_t *CountersBegin = __llvm_profile_begin_counters(); + const uint64_t *CountersEnd = __llvm_profile_end_counters(); + const char *NamesBegin = __llvm_profile_begin_names(); + const char *NamesEnd = __llvm_profile_end_names(); /* Calculate size of sections. */ const uint64_t DataSize = DataEnd - DataBegin; diff --git a/lib/profile/InstrProfilingPlatformDarwin.c b/lib/profile/InstrProfilingPlatformDarwin.c index 74019772d..02299cc46 100644 --- a/lib/profile/InstrProfilingPlatformDarwin.c +++ b/lib/profile/InstrProfilingPlatformDarwin.c @@ -25,19 +25,19 @@ __attribute__((visibility("hidden"))) extern uint64_t CountersEnd __asm("section$end$__DATA$__llvm_prf_cnts"); __attribute__((visibility("hidden"))) -const __llvm_profile_data *__llvm_profile_data_begin(void) { +const __llvm_profile_data *__llvm_profile_begin_data(void) { return &DataStart; } __attribute__((visibility("hidden"))) -const __llvm_profile_data *__llvm_profile_data_end(void) { +const __llvm_profile_data *__llvm_profile_end_data(void) { return &DataEnd; } __attribute__((visibility("hidden"))) -const char *__llvm_profile_names_begin(void) { return &NamesStart; } +const char *__llvm_profile_begin_names(void) { return &NamesStart; } __attribute__((visibility("hidden"))) -const char *__llvm_profile_names_end(void) { return &NamesEnd; } +const char *__llvm_profile_end_names(void) { return &NamesEnd; } __attribute__((visibility("hidden"))) -uint64_t *__llvm_profile_counters_begin(void) { return &CountersStart; } +uint64_t *__llvm_profile_begin_counters(void) { return &CountersStart; } __attribute__((visibility("hidden"))) -uint64_t *__llvm_profile_counters_end(void) { return &CountersEnd; } +uint64_t *__llvm_profile_end_counters(void) { return &CountersEnd; } #endif diff --git a/lib/profile/InstrProfilingPlatformOther.c b/lib/profile/InstrProfilingPlatformOther.c index 404c1a851..548d6a396 100644 --- a/lib/profile/InstrProfilingPlatformOther.c +++ b/lib/profile/InstrProfilingPlatformOther.c @@ -56,19 +56,19 @@ void __llvm_profile_register_function(void *Data_) { } __attribute__((visibility("hidden"))) -const __llvm_profile_data *__llvm_profile_data_begin(void) { +const __llvm_profile_data *__llvm_profile_begin_data(void) { return DataFirst; } __attribute__((visibility("hidden"))) -const __llvm_profile_data *__llvm_profile_data_end(void) { +const __llvm_profile_data *__llvm_profile_end_data(void) { return DataLast; } __attribute__((visibility("hidden"))) -const char *__llvm_profile_names_begin(void) { return NamesFirst; } +const char *__llvm_profile_begin_names(void) { return NamesFirst; } __attribute__((visibility("hidden"))) -const char *__llvm_profile_names_end(void) { return NamesLast; } +const char *__llvm_profile_end_names(void) { return NamesLast; } __attribute__((visibility("hidden"))) -uint64_t *__llvm_profile_counters_begin(void) { return CountersFirst; } +uint64_t *__llvm_profile_begin_counters(void) { return CountersFirst; } __attribute__((visibility("hidden"))) -uint64_t *__llvm_profile_counters_end(void) { return CountersLast; } +uint64_t *__llvm_profile_end_counters(void) { return CountersLast; } #endif |