From 6288183377a0dc8f02ad415eb1ac9338507445aa Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 4 Jan 2021 06:38:52 -0800 Subject: [PATCH] [libcody] Remove some std::move [PR 98368] Compiling on clang showed a couple of pessimizations. Fixed thusly. libcody/ * client.cc (Client::ProcessResponse): Remove std::move inside ?: c++tools/ * resolver.cc (module_resolver::cmi_response): Remove std::move of temporary. --- c++tools/resolver.cc | 4 +--- libcody/client.cc | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/c++tools/resolver.cc b/c++tools/resolver.cc index c8d31153574..ef08de53072 100644 --- a/c++tools/resolver.cc +++ b/c++tools/resolver.cc @@ -226,9 +226,7 @@ module_resolver::cmi_response (Cody::Server *s, std::string &module) auto iter = map.find (module); if (iter == map.end ()) { - std::string file; - if (default_map) - file = std::move (GetCMIName (module)); + std::string file = default_map ? GetCMIName (module) : std::string (); auto res = map.emplace (module, file); iter = res.first; } diff --git a/libcody/client.cc b/libcody/client.cc index edfe44d34b2..ae69d190cb7 100644 --- a/libcody/client.cc +++ b/libcody/client.cc @@ -122,8 +122,7 @@ Packet Client::ProcessResponse (std::vector &words, Assert (!words.empty ()); if (words[0] == u8"ERROR") return Packet (Client::PC_ERROR, - std::move (words.size () == 2 ? words[1] - : u8"malformed error response")); + words.size () == 2 ? words[1]: u8"malformed error response"); if (isLast && !read.IsAtEnd ()) return Packet (Client::PC_ERROR, -- 2.30.2