Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 58a1894

Browse files
authored
Update to latest clang (#6174)
* Roll buildroot to be483cb * Rolls buildtools to c1408453246f0475547b6fe634c2f3dad71c6457
1 parent 9b297b3 commit 58a1894

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ vars = {
102102
# Build bot tooling for iOS
103103
'ios_tools_revision': '69b7c1b160e7107a6a98d948363772dc9caea46f',
104104

105-
'buildtools_revision': 'ae85410691b10aa2469695c2421b1fe751843e64',
105+
'buildtools_revision': 'c1408453246f0475547b6fe634c2f3dad71c6457',
106106
}
107107

108108
# Only these hosts are allowed for dependencies in this DEPS file.
@@ -115,7 +115,7 @@ allowed_hosts = [
115115
]
116116

117117
deps = {
118-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '7aadfaf196f9cd8a299f9ad78fab63362800466d',
118+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'be483cb1cd3a9c4313b2e534034d23a05c3d849e',
119119

120120
# Fuchsia compatibility
121121
#

fml/memory/ref_counted_unittest.cc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@
2929
#define ALLOW_SELF_MOVE(code_line) code_line;
3030
#endif
3131

32+
#if defined(__clang__)
33+
#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) \
34+
_Pragma("clang diagnostic push") \
35+
_Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"") \
36+
code_line; \
37+
_Pragma("clang diagnostic pop")
38+
#else
39+
#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) code_line;
40+
#endif
41+
3242
namespace fml {
3343
namespace {
3444

@@ -425,7 +435,7 @@ TEST(RefCountedTest, SelfAssignment) {
425435
was_destroyed = false;
426436
RefPtr<MyClass> r(MakeRefCounted<MyClass>(&created, &was_destroyed));
427437
// Copy.
428-
r = r;
438+
ALLOW_SELF_ASSIGN_OVERLOADED(r = r);
429439
EXPECT_EQ(created, r.get());
430440
EXPECT_FALSE(was_destroyed);
431441
}

shell/platform/darwin/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ source_set("flutter_channels") {
2828
"ios/framework/Headers/FlutterBinaryMessenger.h",
2929
"ios/framework/Headers/FlutterChannels.h",
3030
"ios/framework/Headers/FlutterCodecs.h",
31+
"ios/framework/Headers/FlutterMacros.h",
3132
"ios/framework/Source/FlutterChannels.mm",
3233
"ios/framework/Source/FlutterCodecs.mm",
3334
"ios/framework/Source/FlutterStandardCodec.mm",

tools/gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def to_gn_args(args):
8989
gn_args['is_debug'] = args.unoptimized
9090
gn_args['android_full_debug'] = args.target_os == 'android' and args.unoptimized
9191
gn_args['is_clang'] = not sys.platform.startswith(('cygwin', 'win'))
92-
92+
9393
gn_args['embedder_for_target'] = args.embedder_for_target
9494

9595
enable_lto = args.lto
@@ -248,9 +248,9 @@ def main(argv):
248248
if sys.platform.startswith(('cygwin', 'win')):
249249
subdir = 'win'
250250
elif sys.platform == 'darwin':
251-
subdir = 'mac'
251+
subdir = 'mac-x64'
252252
elif sys.platform.startswith('linux'):
253-
subdir = 'linux64'
253+
subdir = 'linux-x64'
254254
else:
255255
raise Error('Unknown platform: ' + sys.platform)
256256

0 commit comments

Comments
 (0)