From b40f3ab7a144c8b949586f94f3d9e6dc6c731e06 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Mon, 18 Oct 2021 06:37:26 -0700 Subject: [PATCH] [aapt2] Move type usage before std::move() We want to access type.type before we std::move(type). Bug: 201388769 Test: TreeHugger Change-Id: I8167d12a3a203be28c0d8b796f1f70757dfd99b4 --- tools/aapt2/ResourceTable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp index 77f0ef0ed94cc..dae89b0a1de5c 100644 --- a/tools/aapt2/ResourceTable.cpp +++ b/tools/aapt2/ResourceTable.cpp @@ -440,8 +440,8 @@ ResourceTableView ResourceTable::GetPartitionedView(const ResourceTableViewOptio // Move the type into a new package auto& other_package = new_packages[index]; - type_inserter.Insert(other_package.types, std::move(type)); type_new_package_index[type.type] = index + 1; + type_inserter.Insert(other_package.types, std::move(type)); type_it = package.types.erase(type_it); } }