Fix path to aligned_alloc.h in #include statement #169418
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
libc++
Member
|
@llvm/pr-subscribers-libcxx Author: Walter Lee (googlewalt) ChangesFull diff: https://github.com/llvm/llvm-project/pull/169418.diff 1 Files Affected:
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp
index ce6b63775ce9c..70cdab683a861 100644
--- a/libcxx/src/new.cpp
+++ b/libcxx/src/new.cpp
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "include/aligned_alloc.h"
#include "include/overridable_function.h"
#include <__assert>
-#include <__memory/aligned_alloc.h>
#include <cstddef>
#include <cstdlib>
#include <new>
|
boomanaiden154
approved these changes
Nov 24, 2025
Contributor
boomanaiden154
left a comment
boomanaiden154
left a comment
There was a problem hiding this comment.
A more descriptive title/PR description would be good.
Otherwise LGTM.
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #include "include/aligned_alloc.h" |
Contributor
There was a problem hiding this comment.
We probably want a // from libc++ like in the other headers in #166172.
Contributor
Author
There was a problem hiding this comment.
I don't think so? Here a libcxx source is including a libcxx include. There are no such markers for similar includes in this directory.
Contributor
There was a problem hiding this comment.
Ah, right. Missed that the headers that were annotated there from from libc++abi.
googlewalt
changed the title
aadeshps-mcw
pushed a commit
to aadeshps-mcw/llvm-project
that referenced
this pull request
Nov 26, 2025
brave-builds
pushed a commit
to brave/chromium
that referenced
this pull request
Nov 27, 2025
This morally picks up a single upstream PR that touches both libc++ and libc++abi: llvm/llvm-project#166172 Since we mirror libc++ and libc++abi separately, this single commit has been split into one commit in each repo. ...and then there was a follow-up libc++-only buildfix for it: llvm/llvm-project#169418 To pick both of these up, this rolls libcxxabi by one revision, and libcxx by two. It combines these two rolls: 1. Roll libcxxabi from de02e5d57052 to 83a852080747 (1 revision) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/de02e5d57052..83a852080747 2025-11-24 nikolasklauser@berlin.de [libc++][NFC] Move __memory/aligned_alloc.h into src/ (#166172) 2. Roll libc++ from 25731e23e3aa to 13cfd0942dfd (2 revisions) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/25731e23e3aa..13cfd0942dfd 2025-11-24 49250218+googlewalt@users.noreply.github.com Fix path to aligned_alloc.h in #include statement (#169418) 2025-11-24 nikolasklauser@berlin.de [libc++][NFC] Move __memory/aligned_alloc.h into src/ (#166172) Change-Id: I04f1081884978d693d8a6dac8089e5c417b355e8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7201052 Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by: Hans Wennborg <hans@chromium.org> Cr-Commit-Position: refs/heads/main@{#1551246}
mohd-akram
pushed a commit
to gsource-mirror/chromium-src-buildtools
that referenced
this pull request
Nov 27, 2025
This morally picks up a single upstream PR that touches both libc++ and libc++abi: llvm/llvm-project#166172 Since we mirror libc++ and libc++abi separately, this single commit has been split into one commit in each repo. ...and then there was a follow-up libc++-only buildfix for it: llvm/llvm-project#169418 To pick both of these up, this rolls libcxxabi by one revision, and libcxx by two. It combines these two rolls: 1. Roll libcxxabi from de02e5d57052 to 83a852080747 (1 revision) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/de02e5d57052..83a852080747 2025-11-24 nikolasklauser@berlin.de [libc++][NFC] Move __memory/aligned_alloc.h into src/ (#166172) 2. Roll libc++ from 25731e23e3aa to 13cfd0942dfd (2 revisions) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/25731e23e3aa..13cfd0942dfd 2025-11-24 49250218+googlewalt@users.noreply.github.com Fix path to aligned_alloc.h in #include statement (#169418) 2025-11-24 nikolasklauser@berlin.de [libc++][NFC] Move __memory/aligned_alloc.h into src/ (#166172) Change-Id: I04f1081884978d693d8a6dac8089e5c417b355e8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7201052 Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by: Hans Wennborg <hans@chromium.org> Cr-Commit-Position: refs/heads/main@{#1551246} NOKEYCHECK=True GitOrigin-RevId: d9b454f01e84d2a064c8a230cd30702cfe2e6a93
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.