Fix pass driver's dump_pass_list_ and print_pass_list_.

The lists were allocated with new char[], so they should
have been held by std::unique_ptr<const char[]> rather than
std::unique_ptr<const char>. However, it's much cleaner with
std::string.

Change-Id: Ie7c604773272194345f5e6e3c4803c3a914edf99

1 files changed, 2 insertions, 8 deletions

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 91a1418..4d3d664 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -925,18 +925,12 @@ static int dex2oat(int argc, char** argv) {
       PassDriverME::CreateDefaultPassList(disable_passes);
     } else if (option.starts_with("--print-passes=")) {
       std::string print_passes = option.substr(strlen("--print-passes=")).data();
-      size_t len = print_passes.length() + 1;
-      char* duplicate = new char[len];
-      strncpy(duplicate, print_passes.c_str(), len);
-      PassDriverME::SetPrintPassList(duplicate);
+      PassDriverME::SetPrintPassList(print_passes);
     } else if (option == "--print-all-passes") {
       PassDriverME::SetPrintAllPasses();
     } else if (option.starts_with("--dump-cfg-passes=")) {
       std::string dump_passes = option.substr(strlen("--dump-cfg-passes=")).data();
-      size_t len = dump_passes.length() + 1;
-      char* duplicate = new char[len];
-      strncpy(duplicate, dump_passes.c_str(), len);
-      PassDriverME::SetDumpPassList(duplicate);
+      PassDriverME::SetDumpPassList(dump_passes);
     } else {
       Usage("Unknown argument %s", option.data());
     }