Skip to content

Commit e9f629f

Browse files
rmacnak-googleCommit Bot
authored and
Commit Bot
committed
Update clang and gn to match Fuchsia.
Roll zlib for -Wno-deprecated-non-prototype. TEST=ci Bug: flutter/flutter#103568 Change-Id: I969ab107e8917cc35645cfc9916db0d9ab61b203 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/248720 Reviewed-by: Alexander Aprelev <[email protected]> Commit-Queue: Ryan Macnak <[email protected]>
1 parent 068d88b commit e9f629f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

DEPS

Lines changed: 3 additions & 3 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",
@@ -163,7 +163,7 @@ vars = {
163163
"webkit_inspection_protocol_rev": "e4965778e2837adc62354eec3a19123402997897",
164164
"yaml_edit_rev": "0b74d85fac10b4fbf7d1a347debcf16c8f7b0e9c",
165165
"yaml_rev": "0971c06490b9670add644ed62182acd6a5536946",
166-
"zlib_rev": "27c2f474b71d0d20764f86f60ef8b00da1a16cda",
166+
"zlib_rev": "64bbf988543996eb8df9a86877b32917187eba8f",
167167

168168
# Windows deps
169169
"crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed",

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)