diff options
author | Joerg Sonnenberger <joerg@bec.de> | 2014-02-26 20:33:22 +0000 |
---|---|---|
committer | Joerg Sonnenberger <joerg@bec.de> | 2014-02-26 20:33:22 +0000 |
commit | 0fc6894b9ebf39eaf0f06712815c0b705dbc2624 (patch) | |
tree | 7799c19ee9a43a40fa2533d8432c7048301f8845 /lib/asan | |
parent | 16fc5c924d3b984288a689c967dfc2c35ac8bc22 (diff) |
Reapply r201910. MSVC gets __func__ defined explicitly, even though it
can't build anything here.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@202297 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
-rw-r--r-- | lib/asan/asan_report.cc | 2 | ||||
-rw-r--r-- | lib/asan/asan_thread.cc | 2 | ||||
-rw-r--r-- | lib/asan/tests/asan_racy_double_free_test.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/asan/asan_report.cc b/lib/asan/asan_report.cc index 1af4f7e8a..5e3bccee3 100644 --- a/lib/asan/asan_report.cc +++ b/lib/asan/asan_report.cc @@ -835,7 +835,7 @@ void NOINLINE __asan_set_error_report_callback(void (*callback)(const char*)) { if (callback) { error_message_buffer_size = 1 << 16; error_message_buffer = - (char*)MmapOrDie(error_message_buffer_size, __FUNCTION__); + (char*)MmapOrDie(error_message_buffer_size, __func__); error_message_buffer_pos = 0; } } diff --git a/lib/asan/asan_thread.cc b/lib/asan/asan_thread.cc index 897ff2e6c..d4e098ac7 100644 --- a/lib/asan/asan_thread.cc +++ b/lib/asan/asan_thread.cc @@ -79,7 +79,7 @@ AsanThread *AsanThread::Create(thread_callback_t start_routine, void *arg) { uptr PageSize = GetPageSizeCached(); uptr size = RoundUpTo(sizeof(AsanThread), PageSize); - AsanThread *thread = (AsanThread*)MmapOrDie(size, __FUNCTION__); + AsanThread *thread = (AsanThread*)MmapOrDie(size, __func__); thread->start_routine_ = start_routine; thread->arg_ = arg; diff --git a/lib/asan/tests/asan_racy_double_free_test.cc b/lib/asan/tests/asan_racy_double_free_test.cc index deeeb4f45..23240e714 100644 --- a/lib/asan/tests/asan_racy_double_free_test.cc +++ b/lib/asan/tests/asan_racy_double_free_test.cc @@ -7,7 +7,7 @@ void *x[N]; void *Thread1(void *unused) { for (int i = 0; i < N; i++) { - fprintf(stderr, "%s %d\n", __FUNCTION__, i); + fprintf(stderr, "%s %d\n", __func__, i); free(x[i]); } return NULL; @@ -15,7 +15,7 @@ void *Thread1(void *unused) { void *Thread2(void *unused) { for (int i = 0; i < N; i++) { - fprintf(stderr, "%s %d\n", __FUNCTION__, i); + fprintf(stderr, "%s %d\n", __func__, i); free(x[i]); } return NULL; |