<div dir="ltr">lgtm</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Oct 17, 2016 at 10:37 AM Justin Bogner via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: bogner<br class="gmail_msg">
Date: Mon Oct 17 01:17:56 2016<br class="gmail_msg">
New Revision: 284362<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=284362&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=284362&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
Interpreter: Don't return StringRef from functions whose return value is never used<br class="gmail_msg">
<br class="gmail_msg">
StringRef is passed through all of these APIs but never actually<br class="gmail_msg">
used. Just remove it from the API for now and if people want to use it<br class="gmail_msg">
they can add it back.<br class="gmail_msg">
<br class="gmail_msg">
Modified:<br class="gmail_msg">
lldb/trunk/include/lldb/Interpreter/Args.h<br class="gmail_msg">
lldb/trunk/source/Interpreter/Args.cpp<br class="gmail_msg">
<br class="gmail_msg">
Modified: lldb/trunk/include/lldb/Interpreter/Args.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/Args.h?rev=284362&r1=284361&r2=284362&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/Args.h?rev=284362&r1=284361&r2=284362&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/include/lldb/Interpreter/Args.h (original)<br class="gmail_msg">
+++ lldb/trunk/include/lldb/Interpreter/Args.h Mon Oct 17 01:17:56 2016<br class="gmail_msg">
@@ -193,12 +193,8 @@ public:<br class="gmail_msg">
///<br class="gmail_msg">
/// @param[in] quote_char<br class="gmail_msg">
/// If the argument was originally quoted, put in the quote char here.<br class="gmail_msg">
- ///<br class="gmail_msg">
- /// @return<br class="gmail_msg">
- /// The NULL terminated C string of the copy of \a arg_cstr.<br class="gmail_msg">
//------------------------------------------------------------------<br class="gmail_msg">
- llvm::StringRef AppendArgument(llvm::StringRef arg_str,<br class="gmail_msg">
- char quote_char = '\0');<br class="gmail_msg">
+ void AppendArgument(llvm::StringRef arg_str, char quote_char = '\0');<br class="gmail_msg">
<br class="gmail_msg">
void AppendArguments(const Args &rhs);<br class="gmail_msg">
<br class="gmail_msg">
@@ -219,8 +215,8 @@ public:<br class="gmail_msg">
/// @return<br class="gmail_msg">
/// The NULL terminated C string of the copy of \a arg_cstr.<br class="gmail_msg">
//------------------------------------------------------------------<br class="gmail_msg">
- llvm::StringRef InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str,<br class="gmail_msg">
- char quote_char = '\0');<br class="gmail_msg">
+ void InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str,<br class="gmail_msg">
+ char quote_char = '\0');<br class="gmail_msg">
<br class="gmail_msg">
//------------------------------------------------------------------<br class="gmail_msg">
/// Replaces the argument value at index \a idx to \a arg_cstr<br class="gmail_msg">
@@ -234,13 +230,9 @@ public:<br class="gmail_msg">
///<br class="gmail_msg">
/// @param[in] quote_char<br class="gmail_msg">
/// If the argument was originally quoted, put in the quote char here.<br class="gmail_msg">
- ///<br class="gmail_msg">
- /// @return<br class="gmail_msg">
- /// The NULL terminated C string of the copy of \a arg_cstr if<br class="gmail_msg">
- /// \a idx was a valid index, NULL otherwise.<br class="gmail_msg">
//------------------------------------------------------------------<br class="gmail_msg">
- llvm::StringRef ReplaceArgumentAtIndex(size_t idx, llvm::StringRef arg_str,<br class="gmail_msg">
- char quote_char = '\0');<br class="gmail_msg">
+ void ReplaceArgumentAtIndex(size_t idx, llvm::StringRef arg_str,<br class="gmail_msg">
+ char quote_char = '\0');<br class="gmail_msg">
<br class="gmail_msg">
//------------------------------------------------------------------<br class="gmail_msg">
/// Deletes the argument value at index<br class="gmail_msg">
@@ -289,11 +281,8 @@ public:<br class="gmail_msg">
///<br class="gmail_msg">
/// @param[in] quote_char<br class="gmail_msg">
/// If the argument was originally quoted, put in the quote char here.<br class="gmail_msg">
- ///<br class="gmail_msg">
- /// @return<br class="gmail_msg">
- /// A pointer to the copy of \a arg_cstr that was made.<br class="gmail_msg">
//------------------------------------------------------------------<br class="gmail_msg">
- llvm::StringRef Unshift(llvm::StringRef arg_str, char quote_char = '\0');<br class="gmail_msg">
+ void Unshift(llvm::StringRef arg_str, char quote_char = '\0');<br class="gmail_msg">
<br class="gmail_msg">
//------------------------------------------------------------------<br class="gmail_msg">
/// Parse the arguments in the contained arguments.<br class="gmail_msg">
<br class="gmail_msg">
Modified: lldb/trunk/source/Interpreter/Args.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Args.cpp?rev=284362&r1=284361&r2=284362&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Args.cpp?rev=284362&r1=284361&r2=284362&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/source/Interpreter/Args.cpp (original)<br class="gmail_msg">
+++ lldb/trunk/source/Interpreter/Args.cpp Mon Oct 17 01:17:56 2016<br class="gmail_msg">
@@ -332,8 +332,8 @@ void Args::Shift() {<br class="gmail_msg">
m_entries.erase(m_entries.begin());<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-llvm::StringRef Args::Unshift(llvm::StringRef arg_str, char quote_char) {<br class="gmail_msg">
- return InsertArgumentAtIndex(0, arg_str, quote_char);<br class="gmail_msg">
+void Args::Unshift(llvm::StringRef arg_str, char quote_char) {<br class="gmail_msg">
+ InsertArgumentAtIndex(0, arg_str, quote_char);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
void Args::AppendArguments(const Args &rhs) {<br class="gmail_msg">
@@ -361,30 +361,28 @@ void Args::AppendArguments(const char **<br class="gmail_msg">
m_argv.push_back(nullptr);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-llvm::StringRef Args::AppendArgument(llvm::StringRef arg_str, char quote_char) {<br class="gmail_msg">
- return InsertArgumentAtIndex(GetArgumentCount(), arg_str, quote_char);<br class="gmail_msg">
+void Args::AppendArgument(llvm::StringRef arg_str, char quote_char) {<br class="gmail_msg">
+ InsertArgumentAtIndex(GetArgumentCount(), arg_str, quote_char);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-llvm::StringRef Args::InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str,<br class="gmail_msg">
- char quote_char) {<br class="gmail_msg">
+void Args::InsertArgumentAtIndex(size_t idx, llvm::StringRef arg_str,<br class="gmail_msg">
+ char quote_char) {<br class="gmail_msg">
assert(m_argv.size() == m_entries.size() + 1);<br class="gmail_msg">
assert(m_argv.back() == nullptr);<br class="gmail_msg">
<br class="gmail_msg">
if (idx > m_entries.size())<br class="gmail_msg">
- return llvm::StringRef();<br class="gmail_msg">
+ return;<br class="gmail_msg">
m_entries.emplace(m_entries.begin() + idx, arg_str, quote_char);<br class="gmail_msg">
m_argv.insert(m_argv.begin() + idx, m_entries[idx].data());<br class="gmail_msg">
- return m_entries[idx].ref;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-llvm::StringRef Args::ReplaceArgumentAtIndex(size_t idx,<br class="gmail_msg">
- llvm::StringRef arg_str,<br class="gmail_msg">
- char quote_char) {<br class="gmail_msg">
+void Args::ReplaceArgumentAtIndex(size_t idx, llvm::StringRef arg_str,<br class="gmail_msg">
+ char quote_char) {<br class="gmail_msg">
assert(m_argv.size() == m_entries.size() + 1);<br class="gmail_msg">
assert(m_argv.back() == nullptr);<br class="gmail_msg">
<br class="gmail_msg">
if (idx >= m_entries.size())<br class="gmail_msg">
- return llvm::StringRef();<br class="gmail_msg">
+ return;<br class="gmail_msg">
<br class="gmail_msg">
if (arg_str.size() > m_entries[idx].ref.size()) {<br class="gmail_msg">
m_entries[idx] = ArgEntry(arg_str, quote_char);<br class="gmail_msg">
@@ -395,8 +393,6 @@ llvm::StringRef Args::ReplaceArgumentAtI<br class="gmail_msg">
m_entries[idx].ptr[arg_str.size()] = 0;<br class="gmail_msg">
m_entries[idx].ref = m_entries[idx].ref.take_front(arg_str.size());<br class="gmail_msg">
}<br class="gmail_msg">
-<br class="gmail_msg">
- return m_entries[idx].ref;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
void Args::DeleteArgumentAtIndex(size_t idx) {<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
lldb-commits mailing list<br class="gmail_msg">
<a href="mailto:lldb-commits@lists.llvm.org" class="gmail_msg" target="_blank">lldb-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br class="gmail_msg">
</blockquote></div>