Skip to content

Commit 3f400d7

Browse files
Roll Clang to 80743bd43fd5b38fedc503308e7a652e23d3ec93 (flutter#182919)
Fixes flutter#182781
1 parent 640a089 commit 3f400d7

16 files changed

Lines changed: 53 additions & 46 deletions

File tree

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ vars = {
4343
# updates to Clang Tidy will not turn the tree red.
4444
#
4545
# See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
46-
'clang_version': 'git_revision:8c7a2ce01a77c96028fe2c8566f65c45ad9408d3',
46+
'clang_version': 'git_revision:80743bd43fd5b38fedc503308e7a652e23d3ec93',
4747

4848
'reclient_version': 're_client_version:0.185.0.db415f21-gomaip',
4949

@@ -515,7 +515,7 @@ deps = {
515515
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '794b0cfce1d828d187637e6d932bae484fbe0976',
516516

517517
'engine/src/flutter/third_party/angle':
518-
Var('flutter_git') + '/third_party/angle' + '@' + 'ad5b0084fe6b7606fe87d38f60fddf3cea45a685',
518+
Var('flutter_git') + '/third_party/angle' + '@' + '84027aca9b71c9ba335bd000dad1107b8810a511',
519519

520520
'engine/src/flutter/third_party/vulkan_memory_allocator':
521521
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + 'c788c52156f3ef7bc7ab769cb03c110a53ac8fcb',
@@ -764,7 +764,7 @@ deps = {
764764
'packages': [
765765
{
766766
'package': 'flutter_internal/rbe/reclient_cfgs',
767-
'version': 'LNMZdvF2Y86Dq05IWthtVJ_PswIFSRiywIHrkfHhelUC',
767+
'version': '0vARzGeIZgIhW7zVfWuqIPQ_HXMLDccjAstykWZKjaEC',
768768
}
769769
],
770770
'condition': 'use_rbe',

engine/src/flutter/build/secondary/flutter/third_party/harfbuzz/BUILD.gn

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ config("harfbuzz_flags") {
1313
"-Wno-missing-field-initializers",
1414
"-Wno-unused-variable",
1515
"-Wno-sign-compare",
16+
17+
# Workaround for an incompatibility with current versions of Clang
18+
# (see https://github.com/harfbuzz/harfbuzz/issues/5738)
19+
"-Wno-array-bounds",
1620
]
1721
}
1822

engine/src/flutter/display_list/dl_op_records.h

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,15 @@ struct DLOp {
6868
};
6969

7070
// 4 byte header + 4 byte payload packs into minimum 8 bytes
71-
#define DEFINE_SET_BOOL_OP(name) \
72-
struct Set##name##Op final : DLOp { \
73-
static constexpr auto kType = DisplayListOpType::kSet##name; \
74-
\
75-
explicit Set##name##Op(bool value) : DLOp(kType), value(value) {} \
76-
\
77-
const bool value; \
78-
\
79-
void dispatch(DlOpReceiver& receiver) const { \
80-
receiver.set##name(value); \
81-
} \
71+
#define DEFINE_SET_BOOL_OP(name) \
72+
struct Set##name##Op final : DLOp { \
73+
static constexpr auto kType = DisplayListOpType::kSet##name; \
74+
\
75+
explicit Set##name##Op(bool value) : DLOp(kType), value(value) {} \
76+
\
77+
const bool value; \
78+
\
79+
void dispatch(DlOpReceiver& receiver) const { receiver.set##name(value); } \
8280
};
8381
DEFINE_SET_BOOL_OP(AntiAlias)
8482
DEFINE_SET_BOOL_OP(InvertColors)

engine/src/flutter/flow/layers/performance_overlay_layer_unittests.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,9 @@ TEST_F(PerformanceOverlayLayerTest, InvalidOptions) {
184184
const uint64_t overlay_opts = 0;
185185
auto layer = std::make_shared<PerformanceOverlayLayer>(overlay_opts);
186186

187-
// TODO(): Note calling code has to call set_paint_bounds right now. Make
188-
// this a constructor parameter and move the set_paint_bounds into Preroll
187+
// TODO(team-engine): Note calling code has to call set_paint_bounds right
188+
// now. Make this a constructor parameter and move the set_paint_bounds
189+
// into Preroll
189190
layer->set_paint_bounds(layer_bounds);
190191

191192
layer->Preroll(preroll_context());
@@ -207,8 +208,9 @@ TEST_F(PerformanceOverlayLayerTest, SimpleRasterizerStatistics) {
207208
auto layer = std::make_shared<PerformanceOverlayLayer>(overlay_opts);
208209
auto font = PerformanceOverlayLayer::MakeStatisticsFont("");
209210

210-
// TODO(): Note calling code has to call set_paint_bounds right now. Make
211-
// this a constructor parameter and move the set_paint_bounds into Preroll
211+
// TODO(team-engine): Note calling code has to call set_paint_bounds right
212+
// now. Make this a constructor parameter and move the set_paint_bounds
213+
// into Preroll
212214
layer->set_paint_bounds(layer_bounds);
213215

214216
layer->Preroll(preroll_context());

engine/src/flutter/impeller/display_list/aiks_dl_atlas_unittests.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ RSTransform MakeTranslation(Scalar tx, Scalar ty) {
3333

3434
std::tuple<std::vector<DlRect>, //
3535
std::vector<RSTransform>, //
36-
sk_sp<DlImageImpeller>> CreateTestData(const AiksTest* test) {
36+
sk_sp<DlImageImpeller>>
37+
CreateTestData(const AiksTest* test) {
3738
// Draws the image as four squares stiched together.
3839
auto atlas =
3940
DlImageImpeller::Make(test->CreateTextureForFixture("bay_bridge.jpg"));

engine/src/flutter/impeller/renderer/pipeline_compile_queue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class PipelineCompileQueue final
4545
static std::shared_ptr<PipelineCompileQueue> Create(
4646
std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner);
4747

48-
virtual ~PipelineCompileQueue();
48+
~PipelineCompileQueue();
4949

5050
PipelineCompileQueue(const PipelineCompileQueue&) = delete;
5151

engine/src/flutter/impeller/toolkit/android/toolkit_android_unittests.cc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@
1212

1313
namespace impeller::android::testing {
1414

15-
#define DISABLE_ANDROID_PROC(name) \
16-
struct Disable##name { \
17-
Disable##name() { \
18-
real_proc = GetMutableProcTable().name.proc; \
19-
GetMutableProcTable().name.proc = nullptr; \
20-
} \
21-
~Disable##name() { \
22-
GetMutableProcTable().name.proc = real_proc; \
23-
} \
24-
decltype(name)* real_proc; \
15+
#define DISABLE_ANDROID_PROC(name) \
16+
struct Disable##name { \
17+
Disable##name() { \
18+
real_proc = GetMutableProcTable().name.proc; \
19+
GetMutableProcTable().name.proc = nullptr; \
20+
} \
21+
~Disable##name() { GetMutableProcTable().name.proc = real_proc; } \
22+
decltype(name)* real_proc; \
2523
} disable##name;
2624

2725
TEST(ToolkitAndroidTest, CanCreateProcTable) {

engine/src/flutter/shell/common/persistent_cache_unittests.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ TEST_F(PersistentCacheTest, PurgeAllowsFutureSkSLCache) {
191191
std::promise<bool> io_flushed;
192192
shell->GetTaskRunners().GetIOTaskRunner()->PostTask(
193193
[&io_flushed]() { io_flushed.set_value(true); });
194-
io_flushed.get_future().get(); // Wait for the IO thread to flush the file.
194+
// Wait for the IO thread to flush the file.
195+
EXPECT_TRUE(io_flushed.get_future().get());
195196
ASSERT_GT(persistent_cache->LoadSkSLs().size(), 0u);
196197

197198
// Cleanup

engine/src/flutter/shell/platform/darwin/common/framework/Source/FlutterChannels.mm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ static FlutterBinaryMessengerConnection SetMessageHandler(
5353
FlutterBinaryMessageHandler handler,
5454
NSObject<FlutterTaskQueue>* taskQueue) {
5555
if (taskQueue) {
56-
NSCAssert([messenger respondsToSelector:@selector(setMessageHandlerOnChannel:
57-
binaryMessageHandler:taskQueue:)],
58-
@"");
56+
NSCAssert(
57+
[messenger
58+
respondsToSelector:@selector(
59+
setMessageHandlerOnChannel:binaryMessageHandler:taskQueue:)],
60+
@"");
5961
return [messenger setMessageHandlerOnChannel:name
6062
binaryMessageHandler:handler
6163
taskQueue:taskQueue];

engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,9 @@ - (BOOL)application:(UIApplication*)application
615615
if (!delegate || (isFallback && [self pluginSupportsSceneLifecycle:delegate])) {
616616
continue;
617617
}
618-
if ([delegate respondsToSelector:@selector(application:
619-
performActionForShortcutItem:completionHandler:)]) {
618+
if ([delegate
619+
respondsToSelector:@selector(
620+
application:performActionForShortcutItem:completionHandler:)]) {
620621
if ([delegate application:application
621622
performActionForShortcutItem:shortcutItem
622623
completionHandler:completionHandler]) {
@@ -688,8 +689,8 @@ - (BOOL)application:(UIApplication*)application
688689
if (!delegate || (isFallback && [self pluginSupportsSceneLifecycle:delegate])) {
689690
continue;
690691
}
691-
if ([delegate respondsToSelector:@selector(application:
692-
continueUserActivity:restorationHandler:)]) {
692+
if ([delegate
693+
respondsToSelector:@selector(application:continueUserActivity:restorationHandler:)]) {
693694
if ([delegate application:application
694695
continueUserActivity:userActivity
695696
restorationHandler:restorationHandler]) {

0 commit comments

Comments
 (0)