Skip to content

[ASan][libc++] String annotations optimizations fix with lambda #76200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AdvenamTacet merged 3 commits into from
Jan 8, 2024
Merged

[ASan][libc++] String annotations optimizations fix with lambda #76200

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f52466e
[ASan][libc++] String annotations optimizations fix with lambda
Dec 22, 2023
ab9bff2
Remove a commnet
Dec 27, 2023
716e066
Whitespace
Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion libcxx/include/string
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,10 @@ 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_(((__str.__is_long() ? 0 : (__str.__annotate_delete(), 0)), std::move(__str.__r_))) {
// Lambda is used because of optimization challenges encountered within comma constructors.
// Lambda with argument is correctly optimized, but it does not solve the problem with internal memory
// access macro.
: __r_([](basic_string &__s){ if(!__s.__is_long()) __s.__annotate_delete(); return std::move(__s.__r_);}(__str)) {
__str.__r_.first() = __rep();
__str.__annotate_new(0);
if (!__is_long())
Expand Down