From adcd02683856c30ba6f349279509acecd90063df Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Tue, 28 Jan 2020 20:23:46 +0100 Subject: Make llvm::StringRef to std::string conversions explicit. This is how it should've been and brings it more in line with std::string_view. There should be no functional change here. This is mostly mechanical from a custom clang-tidy check, with a lot of manual fixups. It uncovers a lot of minor inefficiencies. This doesn't actually modify StringRef yet, I'll do that in a follow-up. --- clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp') diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp index 9bf70b7..70735ab 100644 --- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -80,7 +80,9 @@ CreateFrontendBaseAction(CompilerInstance &CI) { std::unique_ptr P(it->instantiate()); if ((P->getActionType() != PluginASTAction::ReplaceAction && P->getActionType() != PluginASTAction::Cmdline) || - !P->ParseArgs(CI, CI.getFrontendOpts().PluginArgs[it->getName()])) + !P->ParseArgs( + CI, + CI.getFrontendOpts().PluginArgs[std::string(it->getName())])) return nullptr; return std::move(P); } @@ -218,7 +220,7 @@ bool ExecuteCompilerInvocation(CompilerInstance *Clang) { std::unique_ptr P(it->instantiate()); if (P->getActionType() == PluginASTAction::ReplaceAction) { Clang->getFrontendOpts().ProgramAction = clang::frontend::PluginAction; - Clang->getFrontendOpts().ActionName = it->getName(); + Clang->getFrontendOpts().ActionName = std::string(it->getName()); break; } } -- cgit v1.1