diff options
author | Zachary Turner <zturner@google.com> | 2017-10-09 18:50:29 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-10-09 18:50:29 +0000 |
commit | 5d1b2d36c7b6db5da794825347a15de261de6e92 (patch) | |
tree | 1dc441cf2378fa57fc9aee056888c0910bf99114 /tools/llvm-rc | |
parent | 280c6ad6bc0ba95b74286082b1546231b911b79e (diff) |
Fix some C++ value / reference semantics issues.
Some functions were taking Twine's not by const&, these are all
fixed to take by const&. We also had a case where some functions
were overloaded to accept by const& and &&. Now there is only
one version which accepts by value and move's the value.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315229 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-rc')
-rw-r--r-- | tools/llvm-rc/ResourceFileWriter.cpp | 2 | ||||
-rw-r--r-- | tools/llvm-rc/ResourceFileWriter.h | 2 | ||||
-rw-r--r-- | tools/llvm-rc/ResourceScriptParser.cpp | 9 | ||||
-rw-r--r-- | tools/llvm-rc/ResourceScriptParser.h | 7 |
4 files changed, 8 insertions, 12 deletions
diff --git a/tools/llvm-rc/ResourceFileWriter.cpp b/tools/llvm-rc/ResourceFileWriter.cpp index 8b7cd92c053..3d72e16bf6e 100644 --- a/tools/llvm-rc/ResourceFileWriter.cpp +++ b/tools/llvm-rc/ResourceFileWriter.cpp @@ -380,7 +380,7 @@ void ResourceFileWriter::padStream(uint64_t Length) { writeInt<uint8_t>(0); } -Error ResourceFileWriter::handleError(Error &&Err, const RCResource *Res) { +Error ResourceFileWriter::handleError(Error Err, const RCResource *Res) { if (Err) return joinErrors(createError("Error in " + Res->getResourceTypeName() + " statement (ID " + Twine(Res->ResName) + diff --git a/tools/llvm-rc/ResourceFileWriter.h b/tools/llvm-rc/ResourceFileWriter.h index b4427160711..8d193d6a948 100644 --- a/tools/llvm-rc/ResourceFileWriter.h +++ b/tools/llvm-rc/ResourceFileWriter.h @@ -88,7 +88,7 @@ public: } StringTableData; private: - Error handleError(Error &&Err, const RCResource *Res); + Error handleError(Error Err, const RCResource *Res); Error writeResource(const RCResource *Res, diff --git a/tools/llvm-rc/ResourceScriptParser.cpp b/tools/llvm-rc/ResourceScriptParser.cpp index 47f8745837e..4acae313558 100644 --- a/tools/llvm-rc/ResourceScriptParser.cpp +++ b/tools/llvm-rc/ResourceScriptParser.cpp @@ -28,7 +28,7 @@ namespace llvm { namespace rc { -RCParser::ParserError::ParserError(const Twine Expected, const LocIter CurLoc, +RCParser::ParserError::ParserError(const Twine &Expected, const LocIter CurLoc, const LocIter End) : ErrorLoc(CurLoc), FileEnd(End) { CurMessage = "Error parsing file: expected " + Expected.str() + ", got " + @@ -37,10 +37,7 @@ RCParser::ParserError::ParserError(const Twine Expected, const LocIter CurLoc, char RCParser::ParserError::ID = 0; -RCParser::RCParser(const std::vector<RCToken> &TokenList) - : Tokens(TokenList), CurLoc(Tokens.begin()), End(Tokens.end()) {} - -RCParser::RCParser(std::vector<RCToken> &&TokenList) +RCParser::RCParser(std::vector<RCToken> TokenList) : Tokens(std::move(TokenList)), CurLoc(Tokens.begin()), End(Tokens.end()) {} bool RCParser::isEof() const { return CurLoc == End; } @@ -706,7 +703,7 @@ RCParser::ParseOptionType RCParser::parseStyleStmt() { return llvm::make_unique<StyleStmt>(*Arg); } -Error RCParser::getExpectedError(const Twine Message, bool IsAlreadyRead) { +Error RCParser::getExpectedError(const Twine &Message, bool IsAlreadyRead) { return make_error<ParserError>( Message, IsAlreadyRead ? std::prev(CurLoc) : CurLoc, End); } diff --git a/tools/llvm-rc/ResourceScriptParser.h b/tools/llvm-rc/ResourceScriptParser.h index f2afe6d7c32..1a124d4ee2e 100644 --- a/tools/llvm-rc/ResourceScriptParser.h +++ b/tools/llvm-rc/ResourceScriptParser.h @@ -36,7 +36,7 @@ public: // Class describing a single failure of parser. class ParserError : public ErrorInfo<ParserError> { public: - ParserError(Twine Expected, const LocIter CurLoc, const LocIter End); + ParserError(const Twine &Expected, const LocIter CurLoc, const LocIter End); void log(raw_ostream &OS) const override { OS << CurMessage; } std::error_code convertToErrorCode() const override { @@ -51,8 +51,7 @@ public: LocIter ErrorLoc, FileEnd; }; - RCParser(const std::vector<RCToken> &TokenList); - RCParser(std::vector<RCToken> &&TokenList); + RCParser(std::vector<RCToken> TokenList); // Reads and returns a single resource definition, or error message if any // occurred. @@ -172,7 +171,7 @@ private: // the token that couldn't be parsed. If the flag is on, this complains about // the correctly read token that makes no sense (that is, the current parser // state is beyond the erroneous token.) - Error getExpectedError(const Twine Message, bool IsAlreadyRead = false); + Error getExpectedError(const Twine &Message, bool IsAlreadyRead = false); std::vector<RCToken> Tokens; LocIter CurLoc; |