commit 7f43595d5884497d874cfafe40030e9891b8d7d6
author Chih-Hung Hsieh <chh@google.com> Wed Mar 04 15:40:34 2020 -0800
committer Chih-hung Hsieh <chh@google.com> Thu Mar 05 18:18:13 2020 +0000
tree 484130ed501630c4ad3fe5314bb05b9a15b3b792
parent d6b07c53088f3b9a75a5df4b3128b7497c7a70e4

Fix/suppress bugprone-use-after-move warnings

Bug: 150783499
Test: WITH_TIDY=1 make
Change-Id: I7278ce52e0f1a82ab8f7b0cf0bf346b55da829f8

libdexfile/dex/dex_file_loader.cc

diff --git a/libdexfile/dex/dex_file_loader.cc b/libdexfile/dex/dex_file_loader.cc
index 7ccc93f..a706e64 100644
--- a/libdexfile/dex/dex_file_loader.cc
+++ b/libdexfile/dex/dex_file_loader.cc
@@ -415,9 +415,11 @@
     return nullptr;
   }
   VerifyResult verify_result;
+  auto map_data = map.data();
+  auto map_size = map.size();
   std::unique_ptr<const DexFile> dex_file = OpenCommon(
-      map.data(),
-      map.size(),
+      map_data,
+      map_size,
       /*data_base=*/ nullptr,
       /*data_size=*/ 0u,
       location,

libdexfile/external/dex_file_supp_test.cc

diff --git a/libdexfile/external/dex_file_supp_test.cc b/libdexfile/external/dex_file_supp_test.cc
index 2f7ad50..955eb12 100644
--- a/libdexfile/external/dex_file_supp_test.cc
+++ b/libdexfile/external/dex_file_supp_test.cc
@@ -62,7 +62,7 @@
 TEST(DexStringTest, move_construct) {
   auto s1 = DexString("foo");
   auto s2 = DexString(std::move(s1));
-  EXPECT_TRUE(std::string_view(s1).empty());
+  EXPECT_TRUE(std::string_view(s1).empty()); // NOLINT bugprone-use-after-move
   EXPECT_EQ(std::string_view(s2), "foo");
 }
 
@@ -71,7 +71,7 @@
   DexString s2;
   EXPECT_TRUE(std::string_view(s2).empty());
   s2 = std::move(s1);
-  EXPECT_TRUE(std::string_view(s1).empty());
+  EXPECT_TRUE(std::string_view(s1).empty()); // NOLINT bugprone-use-after-move
   EXPECT_EQ(std::string_view(s2), "foo");
 }