languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-04 17:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Suppress sign-compare warnings for musl libc"

Browse source 
This reverts commit 9fefe1054e.

Reason for revert: Breaks the riscv64 bot: https://logs.chromium.org/logs/dart-internal/buildbucket/cr-buildbucket/8790248947000585777/+/u/build_dart/stdout

Original change's description:
> Suppress sign-compare warnings for musl libc
>
> Closes https://github.com/dart-lang/sdk/pull/51225
>
> GitOrigin-RevId: 0c2d3d4b79a461d1af2127061b3857f08c22856d
> Change-Id: I9e58cccfdf65604baf0789c2a4294dfb50590e95
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280252
> Reviewed-by: Slava Egorov <vegorov@google.com>
> Commit-Queue: Slava Egorov <vegorov@google.com>

TBR=vegorov@google.com,dart-scoped@luci-project-accounts.iam.gserviceaccount.com,copybara-worker-blackhole@google.com

Change-Id: I05c64d556b7bd6f4099f8468a94557d9a51e5260
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280480
Reviewed-by: Liam Appelbe <liama@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Liam Appelbe <liama@google.com>
This commit is contained in:
Liam Appelbe 2023-02-02 20:28:46 +00:00 committed by Commit Queue
parent deca6a66e7
commit 9ad59be793
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/config/compiler/BUILD.gn
View file

@ -672,9 +672,12 @@ config("chromium_code") {
cflags = [
"-Wall",
"-Wextra",
"-Werror",
]
if (dart_sysroot != "alpine") {
cflags += [ "-Werror" ]
}
defines = []
if (!using_sanitizer && !is_clang) {
# _FORTIFY_SOURCE isn't really supported by Clang now, see

24
runtime/bin/socket_base_posix.cc
View file

@ -21,24 +21,6 @@
#include "bin/socket_base_macos.h"
#include "platform/signal_blocker.h"
// We wrap CMSG_NXTHDR to suppress sign-compare warnings which occur on musl.
#if defined(__clang__)
#define CMSG_NEXTHDR(mhdr, cmsg) \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wsign-compare\"") \
CMSG_NXTHDR(mhdr, cmsg) \
_Pragma("clang diagnostic pop")
#elif defined(__GNUC__)
#define CMSG_NEXTHDR(mhdr, cmsg) \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wsign-compare\"") \
CMSG_NXTHDR(mhdr, cmsg) \
_Pragma("GCC diagnostic pop")
#else
#define CMSG_NEXTHDR(mhdr, cmsg) \
CMSG_NXTHDR(mhdr, cmsg)
#endif
namespace dart {
namespace bin {
@ -169,13 +151,13 @@ intptr_t SocketBase::ReceiveMessage(intptr_t fd,
size_t num_messages = 0;
while (cmsg != nullptr) {
num_messages++;
cmsg = CMSG_NEXTHDR(&msg, cmsg);
cmsg = CMSG_NXTHDR(&msg, cmsg);
}
(*p_messages) = reinterpret_cast<SocketControlMessage*>(
Dart_ScopeAllocate(sizeof(SocketControlMessage) * num_messages));
SocketControlMessage* control_message = *p_messages;
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != nullptr;
cmsg = CMSG_NEXTHDR(&msg, cmsg), control_message++) {
cmsg = CMSG_NXTHDR(&msg, cmsg), control_message++) {
void* data = CMSG_DATA(cmsg);
size_t data_length = cmsg->cmsg_len - (reinterpret_cast<uint8_t*>(data) -
reinterpret_cast<uint8_t*>(cmsg));
@ -278,7 +260,7 @@ intptr_t SocketBase::SendMessage(intptr_t fd,
struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
message = messages;
for (intptr_t i = 0; i < num_messages;
i++, message++, cmsg = CMSG_NEXTHDR(&msg, cmsg)) {
i++, message++, cmsg = CMSG_NXTHDR(&msg, cmsg)) {
ASSERT(message->is_file_descriptors_control_message());
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;