Skip to content

[libc++] Include missing <__assert> after #80091 #83480

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.

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

Conversation

MaskRay
Copy link
Member

@MaskRay MaskRay commented Feb 29, 2024

_LIBCPP_ASSERT_SHIM used by the -fno-exceptions
LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=on configuration needs
_LIBCPP_ASSERT from <__assert>.

Created using spr 1.3.4
@MaskRay MaskRay requested a review from a team as a code owner February 29, 2024 21:01
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Feb 29, 2024
@llvmbot
Copy link
Member

llvmbot commented Feb 29, 2024

@llvm/pr-subscribers-libcxx

Author: Fangrui Song (MaskRay)

Changes

_LIBCPP_ASSERT_SHIM used by the -fno-exceptions
LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=on configuration needs
_LIBCPP_ASSERT from &lt;__assert&gt;.


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

1 Files Affected:

  • (modified) libcxx/src/new.cpp (+1)
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp
index 0869d90661dd51..b0c731678cac30 100644
--- a/libcxx/src/new.cpp
+++ b/libcxx/src/new.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "include/overridable_function.h"
+#include <__assert>
 #include <__memory/aligned_alloc.h>
 #include <cstddef>
 #include <cstdlib>

@ldionne
Copy link
Member

ldionne commented Feb 29, 2024

Thanks for fixing! It looks like that is a blind spot in our CI.

@ldionne
Copy link
Member

ldionne commented Feb 29, 2024

I will merge right away since this is correct by inspection and it will get everything back to green faster.

@ldionne ldionne merged commit 8157847 into main Feb 29, 2024
@ldionne ldionne deleted the users/MaskRay/spr/libc-include-missing-__assert-after-80091 branch February 29, 2024 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants