RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-03-03 18:09:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some C++ value / reference semantics issues.

Browse Source 
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.

llvm-svn: 315229
This commit is contained in:
Zachary Turner 2017-10-09 18:50:29 +00:00
parent 6bf61e532c
commit c7deaade4e
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/llvm-rc/ResourceFileWriter.cpp
View File

@ -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) +

2
tools/llvm-rc/ResourceFileWriter.h
View File

@ -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,

9
tools/llvm-rc/ResourceScriptParser.cpp
View File

@ -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);
}

7
tools/llvm-rc/ResourceScriptParser.h
View File

@ -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;