Skip to content

[llvm] Replace deprecated aligned_storage with aligned byte array #94169

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
merged 3 commits into from
Jun 3, 2024
Merged

[llvm] Replace deprecated aligned_storage with aligned byte array #94169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cb76e8
Replace deprecated aligned_storage with aligned byte array
marcauberer Jun 2, 2024
edee095
Also replace occurrences in PrettyStackTrace
marcauberer Jun 2, 2024
70336eb
Format
marcauberer Jun 2, 2024
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
3 changes: 1 addition & 2 deletions llvm/include/llvm/ADT/FunctionExtras.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,7 @@ template <typename ReturnT, typename... ParamTs> class UniqueFunctionBase {
// provide three pointers worth of storage here.
// This is mutable as an inlined `const unique_function<void() const>` may
// still modify its own mutable members.
mutable std::aligned_storage_t<InlineStorageSize, alignof(void *)>
InlineStorage;
alignas(void *) mutable std::byte InlineStorage[InlineStorageSize];
} StorageUnion;

// A compressed pointer to either our dispatching callback or our table of
Expand Down
7 changes: 3 additions & 4 deletions llvm/lib/Support/PrettyStackTrace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ static void setCrashLogMessage(const char *msg) {

#ifdef __APPLE__
using CrashHandlerString = SmallString<2048>;
using CrashHandlerStringStorage =
std::aligned_storage<sizeof(CrashHandlerString),
alignof(CrashHandlerString)>::type;
static CrashHandlerStringStorage crashHandlerStringStorage;
using CrashHandlerStringStorage = std::byte[sizeof(CrashHandlerString)];
alignas(CrashHandlerString) static CrashHandlerStringStorage
crashHandlerStringStorage;
#endif

/// This callback is run if a fatal signal is delivered to the process, it
Expand Down
Loading