TRY Revert "[ASan][libc++] Initialize __r_ variable with lambda"

[vitalybuka]

Reverts #77394

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Vitaly Buka (vitalybuka)

Changes

Reverts llvm/llvm-project#77394

---

Full diff: https://github.com/llvm/llvm-project/pull/78646.diff

1 Files Affected:

• (modified) libcxx/include/string (+1-1)

diff --git a/libcxx/include/string b/libcxx/include/string
index 4116f350a80476..ecafb80a79a3a2 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -921,7 +921,7 @@ public:
       // Turning off ASan instrumentation for variable initialization with _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS
       // does not work consistently during initialization of __r_, so we instead unpoison __str's memory manually first.
       // __str's memory needs to be unpoisoned only in the case where it's a short string.
-      : __r_([](basic_string &__s) -> decltype(__s.__r_)&& { if(!__s.__is_long()) __s.__annotate_delete(); return std::move(__s.__r_); }(__str)) {
+      : __r_(((__str.__is_long() ? 0 : (__str.__annotate_delete(), 0)), std::move(__str.__r_))) {
     __str.__r_.first() = __rep();
     __str.__annotate_new(0);
     if (!__is_long())

[ldionne]

@vitalybuka Does this still serve a purpose being open?

[ldionne]

I'll tentatively close, please reopen if this serves a purpose. I think it's safe to close since the short string annotations have landed and issues have been handled.

[vitalybuka]

Thanks, that's not needed anymore.