diff options
| author | dim <dim@FreeBSD.org> | 2014-11-06 22:49:13 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-06 22:49:13 +0000 |
| commit | c3f67e1dc21025f1026cbf72628b19fb37f7b53d (patch) | |
| tree | 3467f3372c1195b1546172d89af2205a50b1866d /lib/tsan/rtl/tsan_interface_java.cc | |
| parent | 2f7fa77a0a85c00fd0cce298851e9577b98ccfe8 (diff) | |
| download | FreeBSD-src-c3f67e1dc21025f1026cbf72628b19fb37f7b53d.zip FreeBSD-src-c3f67e1dc21025f1026cbf72628b19fb37f7b53d.tar.gz | |
Import compiler-rt release_34 branch r197381.
https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@197381
Diffstat (limited to 'lib/tsan/rtl/tsan_interface_java.cc')
| -rw-r--r-- | lib/tsan/rtl/tsan_interface_java.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/tsan/rtl/tsan_interface_java.cc b/lib/tsan/rtl/tsan_interface_java.cc index 71e0747..53f14cf 100644 --- a/lib/tsan/rtl/tsan_interface_java.cc +++ b/lib/tsan/rtl/tsan_interface_java.cc @@ -17,6 +17,8 @@ #include "sanitizer_common/sanitizer_internal_defs.h" #include "sanitizer_common/sanitizer_common.h" #include "sanitizer_common/sanitizer_placement_new.h" +#include "sanitizer_common/sanitizer_stacktrace.h" +#include "sanitizer_common/sanitizer_procmaps.h" using namespace __tsan; // NOLINT @@ -157,7 +159,7 @@ SyncVar* GetAndRemoveJavaSync(ThreadState *thr, uptr pc, uptr addr) { #define SCOPED_JAVA_FUNC(func) \ ThreadState *thr = cur_thread(); \ const uptr caller_pc = GET_CALLER_PC(); \ - const uptr pc = (uptr)&func; \ + const uptr pc = __sanitizer::StackTrace::GetCurrentPc(); \ (void)pc; \ ScopedJavaFunc scoped(thr, caller_pc); \ /**/ |
