diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2021-10-06 10:24:24 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-10-06 13:08:47 -0700 |
| commit | 2e3d50c09519d1b4899845b21843bae66ecffc2f (patch) | |
| tree | 1c5ac48bcb8a3893f929c68d5e470913d4d31f97 /libsanitizer/hwasan | |
| parent | 881d1689a42cc7a1fd63bde53c883e52a56eded3 (diff) | |
libsanitizer: Merge with upstream
Merged revision: fdf4c035225de52f596899931b1f6100e5e3e928
Diffstat (limited to 'libsanitizer/hwasan')
| -rw-r--r-- | libsanitizer/hwasan/hwasan.cpp | 4 | ||||
| -rw-r--r-- | libsanitizer/hwasan/hwasan_setjmp_x86_64.S | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libsanitizer/hwasan/hwasan.cpp b/libsanitizer/hwasan/hwasan.cpp index 46541902212..e8ffbbd6f48 100644 --- a/libsanitizer/hwasan/hwasan.cpp +++ b/libsanitizer/hwasan/hwasan.cpp @@ -141,7 +141,7 @@ static void CheckUnwind() { static void HwasanFormatMemoryUsage(InternalScopedString &s) { HwasanThreadList &thread_list = hwasanThreadList(); auto thread_stats = thread_list.GetThreadStats(); - auto *sds = StackDepotGetStats(); + auto sds = StackDepotGetStats(); AllocatorStatCounters asc; GetAllocatorStats(asc); s.append( @@ -151,7 +151,7 @@ static void HwasanFormatMemoryUsage(InternalScopedString &s) { internal_getpid(), GetRSS(), thread_stats.n_live_threads, thread_stats.total_stack_size, thread_stats.n_live_threads * thread_list.MemoryUsedPerThread(), - sds->allocated, sds->n_uniq_ids, asc[AllocatorStatMapped]); + sds.allocated, sds.n_uniq_ids, asc[AllocatorStatMapped]); } #if SANITIZER_ANDROID diff --git a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S index 84512d10b23..7566c1ea0a5 100644 --- a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S +++ b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S @@ -35,6 +35,7 @@ ASM_TYPE_FUNCTION(__interceptor_setjmp) __interceptor_setjmp: CFI_STARTPROC + _CET_ENDBR xorl %esi, %esi jmp __interceptor_sigsetjmp CFI_ENDPROC @@ -44,6 +45,7 @@ ASM_SIZE(__interceptor_setjmp) ASM_TYPE_FUNCTION(__interceptor_sigsetjmp) __interceptor_sigsetjmp: CFI_STARTPROC + _CET_ENDBR // Save callee save registers. mov %rbx, (0*8)(%rdi) |