[core] Fix use after std::move detected by clang-tidy

Detected by the bot being setup at
https://github.com/mapbox/mapbox-gl-native/pull/15385.

(cherry picked from commit 6dfe0e60cad9e7a1e8838374fa5d0fd48ab30782)

3 files changed, 5 insertions, 3 deletions

diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp
index d8d143632c..22be5b8db1 100644
--- a/src/mbgl/layout/symbol_layout.cpp
+++ b/src/mbgl/layout/symbol_layout.cpp
@@ -337,7 +337,7 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap, const GlyphPositions
                     Shaping shaping = applyShaping(*feature.formattedText, WritingModeType::Horizontal, SymbolAnchorType::Center, justification);
                     if (shaping) {
                         shapingForJustification = std::move(shaping);
-                        if (shaping.lineCount == 1u) {
+                        if (shapingForJustification.lineCount == 1u) {
                             shapedTextOrientations.singleLine = true;
                             break;
                         }
diff --git a/src/mbgl/text/glyph_manager.cpp b/src/mbgl/text/glyph_manager.cpp
index daa142e38f..990e8be945 100644
--- a/src/mbgl/text/glyph_manager.cpp
+++ b/src/mbgl/text/glyph_manager.cpp
@@ -98,8 +98,9 @@ void GlyphManager::processResponse(const Response& res, const FontStack& fontSta
         }
 
         for (auto& glyph : glyphs) {
-            entry.glyphs.erase(glyph.id);
-            entry.glyphs.emplace(glyph.id, makeMutable<Glyph>(std::move(glyph)));
+            auto id = glyph.id;
+            entry.glyphs.erase(id);
+            entry.glyphs.emplace(id, makeMutable<Glyph>(std::move(glyph)));
         }
     }
 
diff --git a/src/mbgl/tile/geometry_tile_data.cpp b/src/mbgl/tile/geometry_tile_data.cpp
index 680f8d1497..fea080ddb2 100644
--- a/src/mbgl/tile/geometry_tile_data.cpp
+++ b/src/mbgl/tile/geometry_tile_data.cpp
@@ -76,6 +76,7 @@ std::vector<GeometryCollection> classifyRings(const GeometryCollection& rings) {
         if (ccw == (area < 0 ? -1 : 1) && !polygon.empty()) {
             polygons.push_back(polygon);
             polygon.clear();
+            polygon = GeometryCollection();
         }
 
         polygon.push_back(rings[i]);