[llvm-branch-commits] [compiler-rt] [nfc][tsan] Eliminate a few macros (PR #114931)

[Vitaly Buka via llvm-branch-commits]

https://github.com/vitalybuka updated https://github.com/llvm/llvm-project/pull/114931

>From 7d8cbeb2ba2144c67dca01f2d3d70066fee90c08 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Mon, 4 Nov 2024 21:44:12 -0800
Subject: [PATCH] rebase

Created using spr 1.3.4
---
 compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cpp b/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cpp
index 6e82182e215729..5b1fc8982d95a8 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cpp
@@ -913,8 +913,9 @@ auto AtomicGoRet(ThreadState *thr, uptr cpc, uptr pc, Types... args) {
     return Op::NoTsanAtomic(args...);
   } else {
     FuncEntry(thr, cpc);
-    return Op::Atomic(thr, pc, args...);
+    auto ret = Op::Atomic(thr, pc, args...);
     FuncExit(thr);
+    return ret;
   }
 }