From 14f43a9f53937effedfb09c937f06fbef8598158 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 5 Sep 2018 13:30:49 -0700 Subject: [PATCH 1/5] Update to latest clang --- DEPS | 4 ++-- fml/memory/ref_counted_unittest.cc | 11 ++++++++++- shell/platform/darwin/BUILD.gn | 1 + tools/gn | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 6cc050877a3af..327e4cf4a9899 100644 --- a/DEPS +++ b/DEPS @@ -102,7 +102,7 @@ vars = { # Build bot tooling for iOS 'ios_tools_revision': '69b7c1b160e7107a6a98d948363772dc9caea46f', - 'buildtools_revision': 'ae85410691b10aa2469695c2421b1fe751843e64', + 'buildtools_revision': 'c1408453246f0475547b6fe634c2f3dad71c6457', } # Only these hosts are allowed for dependencies in this DEPS file. @@ -115,7 +115,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '7aadfaf196f9cd8a299f9ad78fab63362800466d', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '51e050a852deed17ce28737de16b26d008519a28', # Fuchsia compatibility # diff --git a/fml/memory/ref_counted_unittest.cc b/fml/memory/ref_counted_unittest.cc index 40b7bd095d412..2ac843bb922b0 100644 --- a/fml/memory/ref_counted_unittest.cc +++ b/fml/memory/ref_counted_unittest.cc @@ -29,6 +29,15 @@ #define ALLOW_SELF_MOVE(code_line) code_line; #endif +#if defined(__clang__) +#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) \ + _Pragma("clang diagnostic push") \ + _Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"") code_line; \ + _Pragma("clang diagnostic pop") +#else +#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) code_line; +#endif + namespace fml { namespace { @@ -425,7 +434,7 @@ TEST(RefCountedTest, SelfAssignment) { was_destroyed = false; RefPtr r(MakeRefCounted(&created, &was_destroyed)); // Copy. - r = r; + ALLOW_SELF_ASSIGN_OVERLOADED(r = r); EXPECT_EQ(created, r.get()); EXPECT_FALSE(was_destroyed); } diff --git a/shell/platform/darwin/BUILD.gn b/shell/platform/darwin/BUILD.gn index e608a9dd6af48..9f4dfca0714c9 100644 --- a/shell/platform/darwin/BUILD.gn +++ b/shell/platform/darwin/BUILD.gn @@ -28,6 +28,7 @@ source_set("flutter_channels") { "ios/framework/Headers/FlutterBinaryMessenger.h", "ios/framework/Headers/FlutterChannels.h", "ios/framework/Headers/FlutterCodecs.h", + "ios/framework/Headers/FlutterMacros.h", "ios/framework/Source/FlutterChannels.mm", "ios/framework/Source/FlutterCodecs.mm", "ios/framework/Source/FlutterStandardCodec.mm", diff --git a/tools/gn b/tools/gn index 0a15b78e2b81b..db79acb3606fb 100755 --- a/tools/gn +++ b/tools/gn @@ -89,7 +89,7 @@ def to_gn_args(args): gn_args['is_debug'] = args.unoptimized gn_args['android_full_debug'] = args.target_os == 'android' and args.unoptimized gn_args['is_clang'] = not sys.platform.startswith(('cygwin', 'win')) - + gn_args['embedder_for_target'] = args.embedder_for_target enable_lto = args.lto @@ -248,7 +248,7 @@ def main(argv): if sys.platform.startswith(('cygwin', 'win')): subdir = 'win' elif sys.platform == 'darwin': - subdir = 'mac' + subdir = 'mac-x64' elif sys.platform.startswith('linux'): subdir = 'linux64' else: From 9b172247ec3674cf68db0633bceddb2ffbb69514 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 5 Sep 2018 13:37:04 -0700 Subject: [PATCH 2/5] format --- fml/memory/ref_counted_unittest.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fml/memory/ref_counted_unittest.cc b/fml/memory/ref_counted_unittest.cc index 2ac843bb922b0..1a97620a8b63e 100644 --- a/fml/memory/ref_counted_unittest.cc +++ b/fml/memory/ref_counted_unittest.cc @@ -30,10 +30,11 @@ #endif #if defined(__clang__) -#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"") code_line; \ - _Pragma("clang diagnostic pop") +#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) \ + _Pragma("clang diagnostic push") \ + _Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"") \ + code_line; \ + _Pragma("clang diagnostic pop") #else #define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) code_line; #endif From 61cef862ce3e69a5021100af68e2022c2b7dd5a6 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 5 Sep 2018 13:45:46 -0700 Subject: [PATCH 3/5] fix linus --- tools/gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index db79acb3606fb..874b9e049a3b7 100755 --- a/tools/gn +++ b/tools/gn @@ -250,7 +250,7 @@ def main(argv): elif sys.platform == 'darwin': subdir = 'mac-x64' elif sys.platform.startswith('linux'): - subdir = 'linux64' + subdir = 'linux-x64' else: raise Error('Unknown platform: ' + sys.platform) From 88405c534db4a6c0552134eb4813142ed39c8423 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 5 Sep 2018 13:53:34 -0700 Subject: [PATCH 4/5] format2 --- fml/memory/ref_counted_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml/memory/ref_counted_unittest.cc b/fml/memory/ref_counted_unittest.cc index 1a97620a8b63e..5b6f68e1de6d1 100644 --- a/fml/memory/ref_counted_unittest.cc +++ b/fml/memory/ref_counted_unittest.cc @@ -34,7 +34,7 @@ _Pragma("clang diagnostic push") \ _Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"") \ code_line; \ - _Pragma("clang diagnostic pop") + _Pragma("clang diagnostic pop") #else #define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) code_line; #endif From 378fbf99013a4d19bd215ca870ccee84ed60bf51 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Thu, 6 Sep 2018 15:15:02 -0700 Subject: [PATCH 5/5] Roll buildroot to be483cb1cd3a9c4313b2e534034d23a05c3d849e --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 327e4cf4a9899..10fc7e1682918 100644 --- a/DEPS +++ b/DEPS @@ -115,7 +115,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '51e050a852deed17ce28737de16b26d008519a28', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'be483cb1cd3a9c4313b2e534034d23a05c3d849e', # Fuchsia compatibility #