commit 41c911f23117fc691fea31f2f6a4b3c9a550762b
author Andreas Gampe <agampe@google.com> Mon Nov 19 11:34:16 2018 -0800
committer Andreas Gampe <agampe@google.com> Mon Nov 19 11:34:16 2018 -0800
tree 22b86d086dee0faddf58175596ad60ff66657303
parent d295a75d952742604eaae0530daea19dd6fd782c

ART: Fix misc-uniqueptr-reset-release

Bug: 32619234
Test: m test-art-host
Change-Id: Iffed77347180aca0f356a03db02ddbe0200b1e9c

runtime/class_loader_context.cc

diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc
index 0bae60a..4eacdad 100644
--- a/runtime/class_loader_context.cc
+++ b/runtime/class_loader_context.cc
@@ -304,11 +304,11 @@
       return nullptr;
     }
     if (first == nullptr) {
-      first.reset(info.release());
+      first = std::move(info);
       previous_iteration = first.get();
     } else {
       CHECK(previous_iteration != nullptr);
-      previous_iteration->parent.reset(info.release());
+      previous_iteration->parent = std::move(info);
       previous_iteration = previous_iteration->parent.get();
     }
   }