Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Suppress bugprone-use-after-move warnings"

Browse Source
This commit is contained in:
Chih-hung Hsieh
2020-03-09 02:48:04 +00:00
committed by Gerrit Code Review
parent 6f56195bec 7a616f65d6
commit 100a6f64e5
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt2/ResourceParser.cpp
View File

@@ -445,6 +445,7 @@ bool ResourceParser::ParseResources(xml::XmlPullParser* parser) {
ParsedResource parsed_resource; ParsedResource parsed_resource;
parsed_resource.config = config_; parsed_resource.config = config_;
parsed_resource.source = source_.WithLine(parser->line_number()); parsed_resource.source = source_.WithLine(parser->line_number());
// NOLINTNEXTLINE(bugprone-use-after-move) move+reset comment
parsed_resource.comment = std::move(comment); parsed_resource.comment = std::move(comment);
if (options_.visibility) { if (options_.visibility) {
parsed_resource.visibility_level = options_.visibility.value(); parsed_resource.visibility_level = options_.visibility.value();
@@ -977,6 +978,7 @@ bool ResourceParser::ParsePublicGroup(xml::XmlPullParser* parser, ParsedResource
child_resource.name.type = *parsed_type; child_resource.name.type = *parsed_type;
child_resource.name.entry = maybe_name.value().to_string(); child_resource.name.entry = maybe_name.value().to_string();
child_resource.id = next_id; child_resource.id = next_id;
// NOLINTNEXTLINE(bugprone-use-after-move) move+reset comment
child_resource.comment = std::move(comment); child_resource.comment = std::move(comment);
child_resource.source = item_source; child_resource.source = item_source;
child_resource.visibility_level = Visibility::Level::kPublic; child_resource.visibility_level = Visibility::Level::kPublic;
@@ -1703,6 +1705,7 @@ bool ResourceParser::ParseDeclareStyleable(xml::XmlPullParser* parser,
ParsedResource child_resource; ParsedResource child_resource;
child_resource.name = child_ref.name.value(); child_resource.name = child_ref.name.value();
child_resource.source = item_source; child_resource.source = item_source;
// NOLINTNEXTLINE(bugprone-use-after-move) move+reset comment
child_resource.comment = std::move(comment); child_resource.comment = std::move(comment);
if (options_.visibility) { if (options_.visibility) {
child_resource.visibility_level = options_.visibility.value(); child_resource.visibility_level = options_.visibility.value();

2
tools/aapt2/util/BigBuffer_test.cpp
View File

@@ -62,7 +62,7 @@ TEST(BigBufferTest, AppendAndMoveBlock) {
*b1 = 44; *b1 = 44;
buffer.AppendBuffer(std::move(buffer2)); buffer.AppendBuffer(std::move(buffer2));
EXPECT_EQ(0u, buffer2.size()); EXPECT_EQ(0u, buffer2.size()); // NOLINT
EXPECT_EQ(buffer2.begin(), buffer2.end()); EXPECT_EQ(buffer2.begin(), buffer2.end());
} }

2
tools/aapt2/xml/XmlDom.cpp
View File

@@ -305,6 +305,8 @@ std::unique_ptr<XmlResource> Inflate(const void* data, size_t len, std::string*
if (pending_element == nullptr) { if (pending_element == nullptr) {
pending_element = util::make_unique<Element>(); pending_element = util::make_unique<Element>();
} }
// pending_element is not nullptr
// NOLINTNEXTLINE(bugprone-use-after-move)
pending_element->namespace_decls.push_back(std::move(decl)); pending_element->namespace_decls.push_back(std::move(decl));
break; break;
} }