From d7e3fadacda4ffc717e407f4fbc99f256dcc8f7a Mon Sep 17 00:00:00 2001 From: Ivan Inozemtsev Date: Mon, 31 Jan 2022 15:49:54 +0000 Subject: [PATCH] Revert "[vm] Disable longjmp() wrapper in exceptional flow in TSAN until g3 issue is fixed" This reverts commit 8d412e80e1b513c49b156c938f9e2eaf4e1d0f0f. Reason for revert: b/209838275#comment53 TEST=ci Original change's description: > [vm] Disable longjmp() wrapper in exceptional flow in TSAN until g3 issue is fixed > > Issue b/209838275 > > TEST=ci > > Change-Id: Ie0a2e6f68a0c4f855dfd367dd3dd0a37053be479 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222760 > Reviewed-by: Ivan Inozemtsev > Commit-Queue: Martin Kustermann # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: Iab202ddbd54060f609096b71f8ef83da53249d40 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/231005 Reviewed-by: Ivan Inozemtsev Commit-Queue: Ivan Inozemtsev Reviewed-by: Martin Kustermann Commit-Queue: Martin Kustermann --- runtime/vm/exceptions.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runtime/vm/exceptions.cc b/runtime/vm/exceptions.cc index 41c46cfd5e1..aeb464002c0 100644 --- a/runtime/vm/exceptions.cc +++ b/runtime/vm/exceptions.cc @@ -631,9 +631,7 @@ void Exceptions::JumpToFrame(Thread* thread, // The shadow call stack register will be restored by the JumpToFrame stub. #endif - // TODO(b/209838275): Re-enable this once g3 build rules for gen_snapshot are - // working with TSAN. -#if 0 // defined(USING_THREAD_SANITIZER) +#if defined(USING_THREAD_SANITIZER) if (thread->exit_through_ffi() == Thread::kExitThroughRuntimeCall) { auto tsan_utils = thread->tsan_utils(); tsan_utils->exception_pc = program_counter;