Skip to content
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

Jump to bottom

Exclude std::abort from compilation when compiling CUDA with Clang #1661

Merged
merged 4 commits into from
May 4, 2020
Merged

Exclude std::abort from compilation when compiling CUDA with Clang #1661

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa3e6e6
excludes std::abort from compilation when compiling CUDA with Clang a…
invexed May 2, 2020
c2ad86f
sync with upstream
invexed May 3, 2020
8225d42
Choose std::terminate unconditionally
invexed May 3, 2020
5934c2d
Remove extraneous #endif
invexed May 3, 2020
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
6 changes: 5 additions & 1 deletion include/fmt/format-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <cstdarg>
#include <cstring> // for std::memmove
#include <cwchar>
#include <exception>

#include "format.h"
#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
Expand Down Expand Up @@ -47,7 +48,10 @@ namespace internal {

FMT_FUNC void assert_fail(const char* file, int line, const char* message) {
print(stderr, "{}:{}: assertion failed: {}", file, line, message);
std::abort();
// Chosen instead of std::abort to satisfy Clang in CUDA mode during device
// code pass.
std::terminate();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can use std::terminate unconditionally but please add a short comment clarifying that it was chosen instead of abort because of CUDA.

#endif
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra #endif.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad. I Tested the wrong branch locally!

}

#ifndef _MSC_VER
Expand Down