Skip to content

Commit 413f60a

Browse files
aamCommit Bot
authored and
Commit Bot
committed
Reland "Update clang and gn to match Fuchsia."
This reverts commit a99b0f6. To fix culprit for the revert, it no longer rolls zlib, instead adds an option to ignore clang warnings in zlib source code. TEST=ci Change-Id: I9a877ff0c08af961bc49fcacaad5b01f1ed0a743 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/249542 Reviewed-by: Ryan Macnak <[email protected]> Commit-Queue: Alexander Aprelev <[email protected]>
1 parent 3f104a2 commit 413f60a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ vars = {
6666
# The list of revisions for these tools comes from Fuchsia, here:
6767
# https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
6868
# If there are problems with the toolchain, contact fuchsia-toolchain@.
69-
"clang_revision": "c2592c374e469f343ecea82d6728609650924259",
70-
"gn_revision": "d7c2209cebcfe37f46dba7be4e1a7000ffc342fb",
69+
"clang_revision": "aaaf8e4c409f080f35ea227b20dc6ac8a45c2fa4",
70+
"gn_revision": "e62d4e1938a45babc9afb6db543f388cd1802a52",
7171

7272
# Scripts that make 'git cl format' work.
7373
"clang_format_scripts_rev": "bb994c6f067340c1135eb43eed84f4b33cfa7397",

build/config/compiler/BUILD.gn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ if (is_win) {
545545
"-Wno-microsoft-unqualified-friend",
546546
"-Wno-unknown-argument", # icu
547547
"-Wno-unused-value", # crashpad
548+
"-Wno-deprecated-non-prototype", # zlib
548549
]
549550
} else {
550551
default_warning_flags += [
@@ -576,6 +577,7 @@ if (is_win) {
576577
default_warning_flags += [
577578
"-Wno-tautological-constant-compare",
578579
"-Wno-unused-but-set-variable", # icu
580+
"-Wno-deprecated-non-prototype", # zlib
579581
]
580582
} else {
581583
default_warning_flags +=

runtime/vm/malloc_hooks_ia32.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
namespace dart {
1212

1313
#if defined(DEBUG)
14-
const intptr_t kSkipCount = 6;
14+
const intptr_t kSkipCount = 7;
1515
#elif !(defined(PRODUCT) || defined(DEBUG))
16-
const intptr_t kSkipCount = 5;
16+
const intptr_t kSkipCount = 6;
1717
#endif
1818

1919
} // namespace dart

0 commit comments

Comments
 (0)