Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest clang #6174

Merged
merged 5 commits into from
Sep 6, 2018
Merged

Update to latest clang #6174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14f43a9
Update to latest clang
goderbauer Sep 5, 2018
9b17224
format
goderbauer Sep 5, 2018
61cef86
fix linus
goderbauer Sep 5, 2018
88405c5
format2
goderbauer Sep 5, 2018
378fbf9
Roll buildroot to be483cb1cd3a9c4313b2e534034d23a05c3d849e
goderbauer Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -115,7 +115,7 @@ allowed_hosts = [
]

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

# Fuchsia compatibility
#
Expand Down
12 changes: 11 additions & 1 deletion fml/memory/ref_counted_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@
#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 {

Expand Down Expand Up @@ -425,7 +435,7 @@ TEST(RefCountedTest, SelfAssignment) {
was_destroyed = false;
RefPtr<MyClass> r(MakeRefCounted<MyClass>(&created, &was_destroyed));
// Copy.
r = r;
ALLOW_SELF_ASSIGN_OVERLOADED(r = r);
EXPECT_EQ(created, r.get());
EXPECT_FALSE(was_destroyed);
}
Expand Down
1 change: 1 addition & 0 deletions shell/platform/darwin/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -248,9 +248,9 @@ 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'
subdir = 'linux-x64'
else:
raise Error('Unknown platform: ' + sys.platform)

Expand Down