[compiler-rt] 05b3374 - [msan] Try to fix powerpc after D131205

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2022-08-10T19:28:30-07:00
New Revision: 05b33749258c0429feb82aec7cb312caee30cdd6

URL: https://github.com/llvm/llvm-project/commit/05b33749258c0429feb82aec7cb312caee30cdd6
DIFF: https://github.com/llvm/llvm-project/commit/05b33749258c0429feb82aec7cb312caee30cdd6.diff

LOG: [msan] Try to fix powerpc after D131205

Added: 
    

Modified: 
    compiler-rt/lib/msan/msan.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/msan/msan.cpp b/compiler-rt/lib/msan/msan.cpp
index 87b0e1f87303a..bb2b7b8d1da82 100644
--- a/compiler-rt/lib/msan/msan.cpp
+++ b/compiler-rt/lib/msan/msan.cpp
@@ -586,9 +586,7 @@ void __msan_set_origin(const void *a, uptr size, u32 origin) {
 // and set the origin to (id | (31-th bit)).
 void __msan_set_alloca_origin(void *a, uptr size, char *descr) {
   __msan_set_alloca_origin4(
-      a, size, descr,
-      StackTrace::GetPreviousInstructionPc(
-          reinterpret_cast<uptr>(__builtin_return_address(0))));
+      a, size, descr, StackTrace::GetPreviousInstructionPc(GET_CALLER_PC()));
 }
 
 void __msan_set_alloca_origin4(void *a, uptr size, char *descr, uptr pc) {