Fix some GCC warnings

We've gone back and forth with redundant std::move in return. We
recently re-enabled the warning (walking back older decisions to try and
support ancient compilers). This CL removes all the std::move that were
found when I tried to build with Debian11's gcc.

It also found one signedness mismatch in a comparison.

Change-Id: I2f4cbf2bf2e8d425f6ec73bbefc4dfb636c7b092
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/731482
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

Author: brianosman

client_utils/android/FrontBufferedStream.cpp

@@ -83,8 +83,7 @@ std::unique_ptr<SkStreamRewindable> FrontBufferedStream::Make(std::unique_ptr<Sk
         return nullptr;
     }
 
-    // Work around a warning regarding a copy on older compilers.
-    return std::move(frontBufferedStream);
+    return frontBufferedStream;
 }
 } // namespace skia
 } // namespace android

modules/skottie/src/SlotManager.cpp

@@ -138,7 +138,7 @@ sk_sp<skresources::ImageAsset> skottie::SlotManager::trackImageValue(SlotID slot
                                                                         imageAsset) {
     auto proxy = sk_make_sp<ImageAssetProxy>(std::move(imageAsset));
     fImageMap[slotID].push_back(proxy);
-    return std::move(proxy);
+    return proxy;
 }
 
 void skottie::SlotManager::trackScalarValue(SlotID slotID, ScalarValue* scalarValue,

modules/skottie/src/layers/FootageLayer.cpp

@@ -173,7 +173,7 @@ sk_sp<sksg::RenderNode> AnimationBuilder::attachFootageAsset(const skjson::Objec
 
     if (!image_transform) {
         // No resize needed.
-        return std::move(image_node);
+        return image_node;
     }
 
     return sksg::TransformEffect::Make(std::move(image_node), std::move(image_transform));

modules/skottie/src/layers/PrecompLayer.cpp

@@ -158,7 +158,7 @@ sk_sp<sksg::RenderNode> AnimationBuilder::attachExternalPrecompLayer(
 
     fCurrentAnimatorScope->push_back(sk_make_sp<AnimatorAdapter>(sg_adapter, fFrameRate));
 
-    return std::move(sg_adapter);
+    return sg_adapter;
 }
 
 sk_sp<sksg::RenderNode> AnimationBuilder::attachPrecompLayer(const skjson::ObjectValue& jlayer,

src/core/SkChromeRemoteGlyphCache.cpp

@@ -778,7 +778,7 @@ sk_sp<SkTypeface> SkStrikeClientImpl::addTypeface(const SkTypefaceProxyPrototype
     auto newTypeface = sk_make_sp<SkTypefaceProxy>(
             typefaceProto, fDiscardableHandleManager, fIsLogging);
     fServerTypefaceIdToTypeface.set(typefaceProto.serverTypefaceID(), newTypeface);
-    return std::move(newTypeface);
+    return newTypeface;
 }
 
 // SkStrikeClient ----------------------------------------------------------------------------------

src/core/SkGlyph.cpp

@@ -111,7 +111,7 @@ std::optional<SkGlyph> SkGlyph::MakeFromBuffer(SkReadBuffer& buffer) {
     glyph.fTop = leftTop & 0xffffu;
     glyph.fMaskFormat = format;
     SkDEBUGCODE(glyph.fAdvancesBoundsFormatAndInitialPathDone = true;)
-    return std::move(glyph);
+    return glyph;
 }
 
 SkGlyph::SkGlyph(const SkGlyph&) = default;

src/core/SkStream.cpp

@@ -934,7 +934,7 @@ std::unique_ptr<SkStreamAsset> SkStream::MakeFromFile(const char path[]) {
     if (!stream->isValid()) {
         return nullptr;
     }
-    return std::move(stream);
+    return stream;
 }
 
 // Declared in SkStreamPriv.h:

src/gpu/ganesh/GrResourceProvider.cpp

@@ -454,7 +454,7 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(GrGpuBufferT
                                                                     const void* staticData,
                                                                     const skgpu::UniqueKey& key) {
     if (auto buffer = this->findByUniqueKey<GrGpuBuffer>(key)) {
-        return std::move(buffer);
+        return buffer;
     }
 
     auto buffer = this->createBuffer(staticData, size, intendedType, kStatic_GrAccessPattern);
@@ -468,7 +468,7 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(GrGpuBufferT
 
     buffer->resourcePriv().setUniqueKey(key);
 
-    return std::move(buffer);
+    return buffer;
 }
 
 sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(
@@ -477,7 +477,7 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(
         const skgpu::UniqueKey& uniqueKey,
         InitializeBufferFn initializeBufferFn) {
     if (auto buffer = this->findByUniqueKey<GrGpuBuffer>(uniqueKey)) {
-        return std::move(buffer);
+        return buffer;
     }
 
     auto buffer = this->createBuffer(size,
@@ -510,7 +510,7 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(
         buffer->updateData(stagingBuffer, /*offset=*/0, size, /*preserve=*/false);
     }
 
-    return std::move(buffer);
+    return buffer;
 }
 
 sk_sp<const GrGpuBuffer> GrResourceProvider::createPatternedIndexBuffer(
@@ -552,7 +552,7 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::createPatternedIndexBuffer(
         SkASSERT(key->isValid());
         this->assignUniqueKeyToResource(*key, buffer.get());
     }
-    return std::move(buffer);
+    return buffer;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

src/gpu/ganesh/SkGr.cpp

@@ -100,7 +100,7 @@ sk_sp<SkIDChangeListener> GrMakeUniqueKeyInvalidationListener(skgpu::UniqueKey*
                                      nullptr);
     SkASSERT(!key->getCustomData());
     key->setCustomData(std::move(data));
-    return std::move(listener);
+    return listener;
 }
 
 sk_sp<GrSurfaceProxy> GrCopyBaseMipMapToTextureProxy(GrRecordingContext* ctx,

src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp

@@ -484,6 +484,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
     interface->fStandard = kGLES_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
-    return std::move(interface);
+    return interface;
 }
 #endif

src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp

@@ -503,6 +503,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g
     interface->fStandard = kGL_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
-    return std::move(interface);
+    return interface;
 }
 #endif

src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp

@@ -262,6 +262,6 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetPro
     interface->fStandard = kWebGL_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
-    return std::move(interface);
+    return interface;
 }
 #endif

src/gpu/ganesh/gl/GrGLGpu.cpp

@@ -741,7 +741,7 @@ sk_sp<GrTexture> GrGLGpu::onWrapBackendTexture(const GrBackendTexture& backendTe
         // Pessimistically assume this external texture may have been bound to a FBO.
         texture->baseLevelWasBoundToFBO();
     }
-    return std::move(texture);
+    return texture;
 }
 
 static bool check_compressed_backend_texture(const GrBackendTexture& backendTex,
@@ -789,10 +789,8 @@ sk_sp<GrTexture> GrGLGpu::onWrapCompressedBackendTexture(const GrBackendTexture&
     GrMipmapStatus mipmapStatus = backendTex.hasMipmaps() ? GrMipmapStatus::kValid
                                                           : GrMipmapStatus::kNotAllocated;
 
-    auto texture = GrGLTexture::MakeWrapped(this, mipmapStatus, desc,
-                                            backendTex.getGLTextureParams(), cacheable,
-                                            kRead_GrIOType, backendTex.getLabel());
-    return std::move(texture);
+    return GrGLTexture::MakeWrapped(this, mipmapStatus, desc, backendTex.getGLTextureParams(),
+                                    cacheable, kRead_GrIOType, backendTex.getLabel());
 }
 
 sk_sp<GrTexture> GrGLGpu::onWrapRenderableBackendTexture(const GrBackendTexture& backendTex,
@@ -835,7 +833,7 @@ sk_sp<GrTexture> GrGLGpu::onWrapRenderableBackendTexture(const GrBackendTexture&
             this, sampleCnt, desc, backendTex.getGLTextureParams(), rtIDs, cacheable,
             mipmapStatus, backendTex.getLabel()));
     texRT->baseLevelWasBoundToFBO();
-    return std::move(texRT);
+    return texRT;
 }
 
 sk_sp<GrRenderTarget> GrGLGpu::onWrapBackendRenderTarget(const GrBackendRenderTarget& backendRT) {
@@ -1563,7 +1561,7 @@ sk_sp<GrTexture> GrGLGpu::onCreateTexture(SkISize dimensions,
                                    levelClearMask);
         }
     }
-    return std::move(tex);
+    return tex;
 }
 
 sk_sp<GrTexture> GrGLGpu::onCreateCompressedTexture(SkISize dimensions,
@@ -1611,7 +1609,7 @@ sk_sp<GrTexture> GrGLGpu::onCreateCompressedTexture(SkISize dimensions,
     // The non-sampler params are still at their default values.
     tex->parameters()->set(&initialState, GrGLTextureParameters::NonsamplerState(),
                            fResetTimestampForTextureParameters);
-    return std::move(tex);
+    return tex;
 }
 
 GrBackendTexture GrGLGpu::onCreateCompressedBackendTexture(
@@ -1917,7 +1915,7 @@ sk_sp<GrAttachment> GrGLGpu::makeStencilAttachment(const GrBackendFormat& colorF
     if (stencil) {
         fStats.incStencilAttachmentCreates();
     }
-    return std::move(stencil);
+    return stencil;
 }
 
 sk_sp<GrAttachment> GrGLGpu::makeMSAAAttachment(SkISize dimensions, const GrBackendFormat& format,

src/lazy/SkDiscardableMemoryPool.cpp

@@ -174,7 +174,7 @@ std::unique_ptr<SkDiscardableMemory> DiscardableMemoryPool::make(size_t bytes) {
     fList.addToHead(dm.get());
     fUsed += bytes;
     this->dumpDownTo(fBudget);
-    return std::move(dm);
+    return dm;
 }
 
 void DiscardableMemoryPool::removeFromPool(PoolDiscardableMemory* dm) {

src/pdf/SkPDFMetadata.cpp

@@ -71,7 +71,7 @@ std::unique_ptr<SkPDFObject> SkPDFMetadata::MakeDocumentInformationDict(
     if (metadata.fModified != kZeroTime) {
         dict->insertTextString("ModDate", pdf_date(metadata.fModified));
     }
-    return std::move(dict);
+    return dict;
 }
 
 SkUUID SkPDFMetadata::CreateUUID(const SkPDF::Metadata& metadata) {
@@ -112,7 +112,7 @@ std::unique_ptr<SkPDFObject> SkPDFMetadata::MakePdfId(const SkUUID& doc, const S
     static_assert(sizeof(SkUUID) == 16, "uuid_size");
     array->appendByteString(SkString(reinterpret_cast<const char*>(&doc     ), sizeof(SkUUID)));
     array->appendByteString(SkString(reinterpret_cast<const char*>(&instance), sizeof(SkUUID)));
-    return std::move(array);
+    return array;
 }
 
 // Convert a block of memory to hexadecimal.  Input and output pointers will be

src/ports/SkFontHost_FreeType.cpp

@@ -677,7 +677,7 @@ std::unique_ptr<SkScalerContext> SkTypeface_FreeType::onCreateScalerContext(
     auto c = std::make_unique<SkScalerContext_FreeType>(
             sk_ref_sp(const_cast<SkTypeface_FreeType*>(this)), effects, desc);
     if (c->success()) {
-        return std::move(c);
+        return c;
     }
     return SkScalerContext::MakeEmpty(
             sk_ref_sp(const_cast<SkTypeface_FreeType*>(this)), effects, desc);

src/ports/SkFontMgr_android.cpp

@@ -385,7 +385,7 @@ class SkFontMgr_Android : public SkFontMgr {
                                                         style, SkToBool(elegant),
                                                         lang.getTag(), character);
                         if (matchingTypeface) {
-                            return std::move(matchingTypeface);
+                            return matchingTypeface;
                         }
 
                         lang = lang.getParent();
@@ -396,7 +396,7 @@ class SkFontMgr_Android : public SkFontMgr {
                                                 style, SkToBool(elegant),
                                                 SkString(), character);
                 if (matchingTypeface) {
-                    return std::move(matchingTypeface);
+                    return matchingTypeface;
                 }
             }
         }

src/shaders/SkLocalMatrixShader.h

@@ -32,7 +32,7 @@ class SkLocalMatrixShader final : public SkShaderBase {
     MakeWrapped(const SkMatrix* localMatrix, Args&&... args) {
         auto t = sk_make_sp<T>(std::forward<Args>(args)...);
         if (!localMatrix || localMatrix->isIdentity()) {
-            return std::move(t);
+            return t;
         }
         return sk_make_sp<SkLocalMatrixShader>(sk_sp<SkShader>(std::move(t)), *localMatrix);
     }

src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp

@@ -84,7 +84,7 @@ std::unique_ptr<Statement> Transform::HoistSwitchVarDeclarationsAtTopLevel(
 
     // If no declarations were found, return the switch as-is.
     if (visitor.fVarDeclarations.empty()) {
-        return std::move(stmt);
+        return stmt;
     }
 
     // Move all of the var-declaration statements into a separate block.

src/utils/SkCanvasStateUtils.cpp

@@ -324,7 +324,7 @@ std::unique_ptr<SkCanvas> SkCanvasStateUtils::MakeFromCanvasState(const SkCanvas
                                                                   state_v1->layers[i].y));
     }
 
-    return std::move(canvas);
+    return canvas;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

tests/MetaDataTest.cpp

@@ -9,11 +9,12 @@
 #include "tests/Test.h"
 #include "tools/SkMetaData.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
 
 DEF_TEST(MetaData, reporter) {
-    SkMetaData  m1;
+    SkMetaData m1;
 
     REPORTER_ASSERT(reporter, !m1.findS32("int"));
     REPORTER_ASSERT(reporter, !m1.findScalar("scalar"));
@@ -26,8 +27,8 @@ DEF_TEST(MetaData, reporter) {
     m1.setBool("true", true);
     m1.setBool("false", false);
 
-    int32_t     n;
-    SkScalar    s;
+    int32_t n;
+    SkScalar s;
 
     m1.setScalar("scalar", SK_Scalar1/2);
 
@@ -51,9 +52,9 @@ DEF_TEST(MetaData, reporter) {
         { "false",  SkMetaData::kBool_Type,     1 }
     };
 
-    int                 loop = 0;
+    size_t loop = 0;
     int count;
-    SkMetaData::Type    t;
+    SkMetaData::Type t;
     while ((name = iter.next(&t, &count)) != nullptr)
     {
         int match = 0;

tests/RefCntTest.cpp

@@ -140,7 +140,7 @@ struct EffectImpl : public Effect {
 static sk_sp<Effect> make_effect() {
     auto foo = EffectImpl::Create();
     foo->fValue = 42;
-    return std::move(foo);
+    return foo;
 }
 
 static void reset_counters() {

tools/gpu/gl/interface/templates.go

@@ -76,7 +76,7 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
     interface->fStandard = kGLES_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
-    return std::move(interface);
+    return interface;
 }
 #endif
 `
@@ -143,7 +143,7 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g
     interface->fStandard = kGL_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
-    return std::move(interface);
+    return interface;
 }
 #endif
 `
@@ -215,7 +215,7 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetPro
     interface->fStandard = kWebGL_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
-    return std::move(interface);
+    return interface;
 }
 #endif
 `