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

Jump to bottom

Turned "unnecessary value" and "move of const" lints to errors on mac #36910

Merged
merged 4 commits into from
Oct 22, 2022
Merged

Turned "unnecessary value" and "move of const" lints to errors on mac #36910

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aad8d17
Turned unnecessary value and move of const to errors for mac host_debug.
gaaclarke Oct 20, 2022
c236920
surfaced the warnings as errors into the lint.sh file
gaaclarke Oct 21, 2022
d2ca757
added TODO
gaaclarke Oct 21, 2022
fce2175
added extra comment
gaaclarke Oct 21, 2022
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
2 changes: 2 additions & 0 deletions .clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ performance-unnecessary-value-param"
# Add checks when all warnings are fixed
# to prevent new warnings being introduced.
# https://github.com/flutter/flutter/issues/93279
# Note: There are platform specific warnings as errors in
# //ci/lint.sh
WarningsAsErrors: "bugprone-use-after-move,\
clang-analyzer-*,\
readability-identifier-naming,\
Expand Down
2 changes: 2 additions & 0 deletions ci/lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
FLUTTER_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)"
DART_BIN="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk/bin"
DART="${DART_BIN}/dart"
MAC_HOST_WARNINGS_AS_ERRORS="performance-move-const-arg,performance-unnecessary-value-param"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a TODO and file an issue to clean this up when done.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flutter/flutter#113848


COMPILE_COMMANDS="$SRC_DIR/out/host_debug/compile_commands.json"
if [ ! -f "$COMPILE_COMMANDS" ]; then
Expand All @@ -43,6 +44,7 @@ cd "$SCRIPT_DIR"
--disable-dart-dev \
"$SRC_DIR/flutter/tools/clang_tidy/bin/main.dart" \
--src-dir="$SRC_DIR" \
--mac-host-warnings-as-errors="$MAC_HOST_WARNINGS_AS_ERRORS" \
"$@"

cd "$FLUTTER_DIR"
Expand Down
8 changes: 4 additions & 4 deletions impeller/renderer/render_target.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const std::optional<StencilAttachment>& RenderTarget::GetStencilAttachment()

RenderTarget RenderTarget::CreateOffscreen(const Context& context,
ISize size,
std::string label,
const std::string& label,
StorageMode color_storage_mode,
LoadAction color_load_action,
StoreAction color_store_action,
Expand Down Expand Up @@ -230,7 +230,7 @@ RenderTarget RenderTarget::CreateOffscreen(const Context& context,
stencil0.texture->SetLabel(SPrintF("%s Stencil Texture", label.c_str()));

RenderTarget target;
target.SetColorAttachment(std::move(color0), 0u);
target.SetColorAttachment(color0, 0u);
target.SetStencilAttachment(std::move(stencil0));

return target;
Expand All @@ -239,7 +239,7 @@ RenderTarget RenderTarget::CreateOffscreen(const Context& context,
RenderTarget RenderTarget::CreateOffscreenMSAA(
const Context& context,
ISize size,
std::string label,
const std::string& label,
StorageMode color_storage_mode,
StorageMode color_resolve_storage_mode,
LoadAction color_load_action,
Expand Down Expand Up @@ -322,7 +322,7 @@ RenderTarget RenderTarget::CreateOffscreenMSAA(
stencil0.texture->SetLabel(SPrintF("%s Stencil Texture", label.c_str()));

RenderTarget target;
target.SetColorAttachment(std::move(color0), 0u);
target.SetColorAttachment(color0, 0u);
target.SetStencilAttachment(std::move(stencil0));

return target;
Expand Down
4 changes: 2 additions & 2 deletions impeller/renderer/render_target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class RenderTarget {
static RenderTarget CreateOffscreen(
const Context& context,
ISize size,
std::string label = "Offscreen",
const std::string& label = "Offscreen",
StorageMode color_storage_mode = StorageMode::kDevicePrivate,
LoadAction color_load_action = LoadAction::kClear,
StoreAction color_store_action = StoreAction::kStore,
Expand All @@ -33,7 +33,7 @@ class RenderTarget {
static RenderTarget CreateOffscreenMSAA(
const Context& context,
ISize size,
std::string label = "Offscreen MSAA",
const std::string& label = "Offscreen MSAA",
StorageMode color_storage_mode = StorageMode::kDeviceTransient,
StorageMode color_resolve_storage_mode = StorageMode::kDevicePrivate,
LoadAction color_load_action = LoadAction::kClear,
Expand Down
4 changes: 2 additions & 2 deletions impeller/typographer/backends/skia/text_render_context_skia.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ static FontGlyphPair::Set CollectUniqueFontGlyphPairsSet(

static FontGlyphPair::Vector CollectUniqueFontGlyphPairs(
GlyphAtlas::Type type,
TextRenderContext::FrameIterator frame_iterator) {
const TextRenderContext::FrameIterator& frame_iterator) {
TRACE_EVENT0("impeller", __FUNCTION__);
FontGlyphPair::Vector vector;
auto set = CollectUniqueFontGlyphPairsSet(type, std::move(frame_iterator));
auto set = CollectUniqueFontGlyphPairsSet(type, frame_iterator);
vector.reserve(set.size());
for (const auto& item : set) {
vector.emplace_back(item);
Expand Down
4 changes: 2 additions & 2 deletions impeller/typographer/typographer_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ TEST_P(TypographerTest, LazyAtlasTracksColor) {
LazyGlyphAtlas lazy_atlas;
ASSERT_FALSE(lazy_atlas.HasColor());

lazy_atlas.AddTextFrame(std::move(frame));
lazy_atlas.AddTextFrame(frame);

ASSERT_FALSE(lazy_atlas.HasColor());

frame = TextFrameFromTextBlob(SkTextBlob::MakeFromString("😀 ", emoji_font));

ASSERT_TRUE(frame.HasColor());

lazy_atlas.AddTextFrame(std::move(frame));
lazy_atlas.AddTextFrame(frame);

ASSERT_TRUE(lazy_atlas.HasColor());
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/compositing/scene.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static sk_sp<DlImage> CreateDeferredImage(
width, height, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
return DlDeferredImageGPUSkia::MakeFromLayerTree(
image_info, std::move(layer_tree), std::move(snapshot_delegate),
std::move(raster_task_runner), std::move(unref_queue));
raster_task_runner, std::move(unref_queue));
}

void Scene::RasterizeToImage(uint32_t width,
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/painting/image_encoding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ Dart_Handle EncodeImage(CanvasImage* canvas_image,
snapshot_delegate =
UIDartState::Current()->GetSnapshotDelegate()]() mutable {
EncodeImageAndInvokeDataCallback(
std::move(image), std::move(callback), image_format, ui_task_runner,
std::move(raster_task_runner), std::move(io_task_runner),
io_manager->GetResourceContext(), std::move(snapshot_delegate),
image, std::move(callback), image_format, ui_task_runner,
raster_task_runner, io_task_runner,
io_manager->GetResourceContext(), snapshot_delegate,
io_manager->GetIsGpuDisabledSyncSwitch());
}));

Expand Down
5 changes: 3 additions & 2 deletions lib/ui/painting/immutable_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ Dart_Handle ImmutableBuffer::initFromFile(Dart_Handle raw_buffer_handle,
sk_data = MakeSkDataWithCopy(bytes, buffer_size);
}
ui_task_runner->PostTask(
[sk_data = std::move(sk_data), ui_task = std::move(ui_task),
buffer_size]() { ui_task(sk_data, buffer_size); });
[sk_data = std::move(sk_data), ui_task = ui_task, buffer_size]() {
ui_task(sk_data, buffer_size);
});
});
return Dart_Null();
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/painting/multi_frame_codec.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ void MultiFrameCodec::State::GetNextFrameAndInvokeCallback(
int duration = 0;
sk_sp<DlImage> dlImage =
GetNextFrameImage(std::move(resourceContext), gpu_disable_sync_switch,
impeller_context, unref_queue);
std::move(impeller_context), std::move(unref_queue));
if (dlImage) {
image = CanvasImage::Create();
image->set_image(dlImage);
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/ui_dart_state.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ UIDartState::Context::Context(
advisory_script_uri(std::move(advisory_script_uri)),
advisory_script_entrypoint(std::move(advisory_script_entrypoint)),
volatile_path_tracker(std::move(volatile_path_tracker)),
concurrent_task_runner(concurrent_task_runner),
concurrent_task_runner(std::move(concurrent_task_runner)),
enable_impeller(enable_impeller) {}

UIDartState::UIDartState(
Expand Down
11 changes: 7 additions & 4 deletions shell/platform/embedder/tests/embedder_test_compositor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "flutter/shell/platform/embedder/tests/embedder_test_compositor.h"

#include <utility>

#include "flutter/fml/logging.h"
#include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
#include "third_party/skia/include/core/SkSurface.h"
Expand All @@ -13,7 +15,7 @@ namespace testing {

EmbedderTestCompositor::EmbedderTestCompositor(SkISize surface_size,
sk_sp<GrDirectContext> context)
: surface_size_(surface_size), context_(context) {
: surface_size_(surface_size), context_(std::move(context)) {
FML_CHECK(!surface_size_.isEmpty()) << "Surface size must not be empty";
}

Expand Down Expand Up @@ -118,16 +120,17 @@ size_t EmbedderTestCompositor::GetBackingStoresCollectedCount() const {
}

void EmbedderTestCompositor::AddOnCreateRenderTargetCallback(
fml::closure callback) {
const fml::closure& callback) {
on_create_render_target_callbacks_.push_back(callback);
}

void EmbedderTestCompositor::AddOnCollectRenderTargetCallback(
fml::closure callback) {
const fml::closure& callback) {
on_collect_render_target_callbacks_.push_back(callback);
}

void EmbedderTestCompositor::AddOnPresentCallback(fml::closure callback) {
void EmbedderTestCompositor::AddOnPresentCallback(
const fml::closure& callback) {
on_present_callbacks_.push_back(callback);
}

Expand Down
6 changes: 3 additions & 3 deletions shell/platform/embedder/tests/embedder_test_compositor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ class EmbedderTestCompositor {

size_t GetBackingStoresCollectedCount() const;

void AddOnCreateRenderTargetCallback(fml::closure callback);
void AddOnCreateRenderTargetCallback(const fml::closure& callback);

void AddOnCollectRenderTargetCallback(fml::closure callback);
void AddOnCollectRenderTargetCallback(const fml::closure& callback);

void AddOnPresentCallback(fml::closure callback);
void AddOnPresentCallback(const fml::closure& callback);

sk_sp<GrDirectContext> GetGrContext();

Expand Down
4 changes: 3 additions & 1 deletion shell/platform/embedder/tests/embedder_test_compositor_gl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "flutter/shell/platform/embedder/tests/embedder_test_compositor_gl.h"

#include <utility>

#include "flutter/fml/logging.h"
#include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
#include "third_party/skia/include/core/SkSurface.h"
Expand All @@ -14,7 +16,7 @@ namespace testing {
EmbedderTestCompositorGL::EmbedderTestCompositorGL(
SkISize surface_size,
sk_sp<GrDirectContext> context)
: EmbedderTestCompositor(surface_size, context) {}
: EmbedderTestCompositor(surface_size, std::move(context)) {}

EmbedderTestCompositorGL::~EmbedderTestCompositorGL() = default;

Expand Down
4 changes: 3 additions & 1 deletion shell/platform/embedder/tests/embedder_test_compositor_metal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "flutter/shell/platform/embedder/tests/embedder_test_compositor_metal.h"

#include <utility>

#include "flutter/fml/logging.h"
#include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
#include "third_party/skia/include/core/SkSurface.h"
Expand All @@ -14,7 +16,7 @@ namespace testing {
EmbedderTestCompositorMetal::EmbedderTestCompositorMetal(
SkISize surface_size,
sk_sp<GrDirectContext> context)
: EmbedderTestCompositor(surface_size, context) {}
: EmbedderTestCompositor(surface_size, std::move(context)) {}

EmbedderTestCompositorMetal::~EmbedderTestCompositorMetal() = default;

Expand Down
4 changes: 3 additions & 1 deletion shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "flutter/shell/platform/embedder/tests/embedder_test_compositor_vulkan.h"

#include <utility>

#include "flutter/fml/logging.h"
#include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
#include "flutter/shell/platform/embedder/tests/embedder_test_backingstore_producer.h"
Expand All @@ -15,7 +17,7 @@ namespace testing {
EmbedderTestCompositorVulkan::EmbedderTestCompositorVulkan(
SkISize surface_size,
sk_sp<GrDirectContext> context)
: EmbedderTestCompositor(surface_size, context) {}
: EmbedderTestCompositor(surface_size, std::move(context)) {}

EmbedderTestCompositorVulkan::~EmbedderTestCompositorVulkan() = default;

Expand Down
7 changes: 5 additions & 2 deletions shell/platform/embedder/tests/embedder_test_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "flutter/shell/platform/embedder/tests/embedder_test_context.h"

#include <utility>

#include "flutter/fml/make_copyable.h"
#include "flutter/fml/paths.h"
#include "flutter/runtime/dart_vm.h"
Expand Down Expand Up @@ -94,7 +96,8 @@ void EmbedderTestContext::SetRootSurfaceTransformation(SkMatrix matrix) {
root_surface_transformation_ = matrix;
}

void EmbedderTestContext::AddIsolateCreateCallback(fml::closure closure) {
void EmbedderTestContext::AddIsolateCreateCallback(
const fml::closure& closure) {
if (closure) {
isolate_create_callbacks_.push_back(closure);
}
Expand Down Expand Up @@ -226,7 +229,7 @@ void EmbedderTestContext::FireRootSurfacePresentCallbackIfPresent(

void EmbedderTestContext::SetVsyncCallback(
std::function<void(intptr_t)> callback) {
vsync_callback_ = callback;
vsync_callback_ = std::move(callback);
}

void EmbedderTestContext::RunVsyncCallback(intptr_t baton) {
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/embedder/tests/embedder_test_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class EmbedderTestContext {

void SetRootSurfaceTransformation(SkMatrix matrix);

void AddIsolateCreateCallback(fml::closure closure);
void AddIsolateCreateCallback(const fml::closure& closure);

void AddNativeCallback(const char* name, Dart_NativeFunction function);

Expand Down
10 changes: 6 additions & 4 deletions shell/platform/embedder/tests/embedder_test_context_gl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "flutter/shell/platform/embedder/tests/embedder_test_context_gl.h"

#include <utility>

#include "flutter/fml/make_copyable.h"
#include "flutter/fml/paths.h"
#include "flutter/runtime/dart_vm.h"
Expand All @@ -18,7 +20,7 @@ namespace flutter {
namespace testing {

EmbedderTestContextGL::EmbedderTestContextGL(std::string assets_path)
: EmbedderTestContext(assets_path) {}
: EmbedderTestContext(std::move(assets_path)) {}

EmbedderTestContextGL::~EmbedderTestContextGL() {
SetGLGetFBOCallback(nullptr);
Expand Down Expand Up @@ -61,18 +63,18 @@ bool EmbedderTestContextGL::GLPresent(FlutterPresentInfo present_info) {

void EmbedderTestContextGL::SetGLGetFBOCallback(GLGetFBOCallback callback) {
std::scoped_lock lock(gl_callback_mutex_);
gl_get_fbo_callback_ = callback;
gl_get_fbo_callback_ = std::move(callback);
}

void EmbedderTestContextGL::SetGLPopulateExistingDamageCallback(
GLPopulateExistingDamageCallback callback) {
std::scoped_lock lock(gl_callback_mutex_);
gl_populate_existing_damage_callback_ = callback;
gl_populate_existing_damage_callback_ = std::move(callback);
}

void EmbedderTestContextGL::SetGLPresentCallback(GLPresentCallback callback) {
std::scoped_lock lock(gl_callback_mutex_);
gl_present_callback_ = callback;
gl_present_callback_ = std::move(callback);
}

uint32_t EmbedderTestContextGL::GLGetFramebuffer(FlutterFrameInfo frame_info) {
Expand Down
6 changes: 4 additions & 2 deletions shell/platform/embedder/tests/embedder_test_context_software.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "flutter/shell/platform/embedder/tests/embedder_test_context_software.h"

#include <utility>

#include "flutter/fml/make_copyable.h"
#include "flutter/fml/paths.h"
#include "flutter/runtime/dart_vm.h"
Expand All @@ -18,11 +20,11 @@ namespace testing {

EmbedderTestContextSoftware::EmbedderTestContextSoftware(
std::string assets_path)
: EmbedderTestContext(assets_path) {}
: EmbedderTestContext(std::move(assets_path)) {}

EmbedderTestContextSoftware::~EmbedderTestContextSoftware() = default;

bool EmbedderTestContextSoftware::Present(sk_sp<SkImage> image) {
bool EmbedderTestContextSoftware::Present(const sk_sp<SkImage>& image) {
software_surface_present_count_++;

FireRootSurfacePresentCallbackIfPresent([image] { return image; });
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/embedder/tests/embedder_test_context_software.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class EmbedderTestContextSoftware : public EmbedderTestContext {
// |EmbedderTestContext|
EmbedderTestContextType GetContextType() const override;

bool Present(sk_sp<SkImage> image);
bool Present(const sk_sp<SkImage>& image);

protected:
virtual void SetupCompositor() override;
Expand Down
Loading