Move __allocator under PAL_STDCPP_COMPAT #34141
Merged
Conversation
This file contains 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
jkotas
approved these changes
Mar 26, 2020
|
Failures seem unrelated:
|
|
Since the stacktraces are similar, this will hopefully also fix the macOS flakiness reported in dotnet/source-build#1449. |
WardenGnaw
added a commit
to WardenGnaw/coreclr
that referenced
this pull request
Apr 22, 2020
Fixes CoreCLR build on Android device with Clang 9.0.1.
make[2]: Entering directory
'/data/data/com.termux/files/home/runtime/artifacts/obj/coreclr/Linux.x64.Debug'
make[2]: Leaving directory
'/data/data/com.termux/files/home/runtime/artifacts/obj/coreclr/Linux.x64.Debug'
In file included from
/data/data/com.termux/files/home/runtime/src/coreclr/src/debug/dbgutil/elfreader.cpp:11:
In file included from
/data/data/com.termux/files/home/runtime/src/coreclr/src/debug/dbgutil/elfreader.h:9:
In file included from
/data/data/com.termux/files/usr/bin/../include/c++/v1/string:505:
In file included from
/data/data/com.termux/files/usr/bin/../include/c++/v1/string_view:176:
In file included from
/data/data/com.termux/files/usr/bin/../include/c++/v1/__string:57:
In file included from
/data/data/com.termux/files/usr/bin/../include/c++/v1/algorithm:645:
/data/data/com.termux/files/usr/bin/../include/c++/v1/functional:1493:31:
error: expected member name or ';' after declaration specifiers
const _Alloc& __allocator() const { return __f_.second(); }
~~~~~~~~~~~~ ^
/data/data/com.termux/files/usr/bin/../include/c++/v1/functional:1615:29:
error: expected unqualified-id
_Ap __a(__f_.__allocator());
^
/data/data/com.termux/files/usr/bin/../include/c++/v1/functional:1626:57:
error: expected unqualified-id
::new (__p) __func(__f_.__target(), __f_.__allocator());
^
/data/data/com.termux/files/usr/bin/../include/c++/v1/functional:1642:29:
error: expected unqualified-id
_Ap __a(__f_.__allocator());
^
/data/data/com.termux/files/usr/bin/../include/c++/v1/functional:1928:39:
error: expected unqualified-id
_FunAlloc __a(__f->__allocator());
^
make[2]: Entering directory
'/data/data/com.termux/files/home/runtime/artifacts/obj/coreclr/Linux.x64.Debug'
make[2]: Entering directory
'/data/data/com.termux/files/home/runtime/artifacts/obj/coreclr/Linux.x64.Debug'
This was also fixed in LLVM repo: https://reviews.llvm.org/D57355.
From dotnet/runtime#34141
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes CoreCLR build on Android device with Clang 9.0.1.
This was also fixed in LLVM repo: https://reviews.llvm.org/D57355.