maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-rc] Import all make_unique invocations from llvm namespace. 

Previous patch fixed one of LLVM buildbots (lld-x86_64-win7).
However, some others have already been failing because of make_unique
compilation error (llvm-clang-x86_64-expensive-checks-win).

llvm-svn: 314480
This commit is contained in:
Marek Sokolowski 2017-09-29 00:33:57 +00:00
parent 714ee4d536
commit 4a765da3e9
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,7 +365,8 @@ RCParser::ParseType RCParser::parseAcceleratorsResource() {
ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements()); ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements());
RETURN_IF_ERROR(consumeType(Kind::BlockBegin)); RETURN_IF_ERROR(consumeType(Kind::BlockBegin));
auto Accels = make_unique<AcceleratorsResource>(std::move(*OptStatements)); auto Accels =
llvm::make_unique<AcceleratorsResource>(std::move(*OptStatements));
while (!consumeOptionalType(Kind::BlockEnd)) { while (!consumeOptionalType(Kind::BlockEnd)) {
ASSIGN_OR_RETURN(EventResult, readIntOrString()); ASSIGN_OR_RETURN(EventResult, readIntOrString());
@ -381,7 +382,7 @@ RCParser::ParseType RCParser::parseAcceleratorsResource() {
RCParser::ParseType RCParser::parseCursorResource() { RCParser::ParseType RCParser::parseCursorResource() {
ASSIGN_OR_RETURN(Arg, readString()); ASSIGN_OR_RETURN(Arg, readString());
return make_unique<CursorResource>(*Arg); return llvm::make_unique<CursorResource>(*Arg);
} }
RCParser::ParseType RCParser::parseDialogResource(bool IsExtended) { RCParser::ParseType RCParser::parseDialogResource(bool IsExtended) {
@ -404,7 +405,7 @@ RCParser::ParseType RCParser::parseDialogResource(bool IsExtended) {
"parseOptionalStatements, when successful, halts on BlockBegin."); "parseOptionalStatements, when successful, halts on BlockBegin.");
consume(); consume();
auto Dialog = make_unique<DialogResource>( auto Dialog = llvm::make_unique<DialogResource>(
(*LocResult)[0], (*LocResult)[1], (*LocResult)[2], (*LocResult)[3], (*LocResult)[0], (*LocResult)[1], (*LocResult)[2], (*LocResult)[3],
HelpID, std::move(*OptStatements), IsExtended); HelpID, std::move(*OptStatements), IsExtended);
@ -422,7 +423,7 @@ RCParser::ParseType RCParser::parseUserDefinedResource(IntOrString Type) {
// Check if this is a file resource. // Check if this is a file resource.
if (look().kind() == Kind::String) if (look().kind() == Kind::String)
return make_unique<UserDefinedResource>(Type, read().value()); return llvm::make_unique<UserDefinedResource>(Type, read().value());
RETURN_IF_ERROR(consumeType(Kind::BlockBegin)); RETURN_IF_ERROR(consumeType(Kind::BlockBegin));
std::vector<IntOrString> Data; std::vector<IntOrString> Data;
@ -438,7 +439,7 @@ RCParser::ParseType RCParser::parseUserDefinedResource(IntOrString Type) {
Data.push_back(*Item); Data.push_back(*Item);
} }
return make_unique<UserDefinedResource>(Type, std::move(Data)); return llvm::make_unique<UserDefinedResource>(Type, std::move(Data));
} }
RCParser::ParseType RCParser::parseVersionInfoResource() { RCParser::ParseType RCParser::parseVersionInfoResource() {
@ -480,19 +481,19 @@ Expected<Control> RCParser::parseControl() {
RCParser::ParseType RCParser::parseIconResource() { RCParser::ParseType RCParser::parseIconResource() {
ASSIGN_OR_RETURN(Arg, readString()); ASSIGN_OR_RETURN(Arg, readString());
return make_unique<IconResource>(*Arg); return llvm::make_unique<IconResource>(*Arg);
} }
RCParser::ParseType RCParser::parseHTMLResource() { RCParser::ParseType RCParser::parseHTMLResource() {
ASSIGN_OR_RETURN(Arg, readString()); ASSIGN_OR_RETURN(Arg, readString());
return make_unique<HTMLResource>(*Arg); return llvm::make_unique<HTMLResource>(*Arg);
} }
RCParser::ParseType RCParser::parseMenuResource() { RCParser::ParseType RCParser::parseMenuResource() {
ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements()); ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements());
ASSIGN_OR_RETURN(Items, parseMenuItemsList()); ASSIGN_OR_RETURN(Items, parseMenuItemsList());
return make_unique<MenuResource>(std::move(*OptStatements), return llvm::make_unique<MenuResource>(std::move(*OptStatements),
std::move(*Items)); std::move(*Items));
} }
Expected<MenuDefinitionList> RCParser::parseMenuItemsList() { Expected<MenuDefinitionList> RCParser::parseMenuItemsList() {
@ -516,7 +517,7 @@ Expected<MenuDefinitionList> RCParser::parseMenuItemsList() {
// Now, expecting SEPARATOR. // Now, expecting SEPARATOR.
ASSIGN_OR_RETURN(SeparatorResult, readIdentifier()); ASSIGN_OR_RETURN(SeparatorResult, readIdentifier());
if (SeparatorResult->equals_lower("SEPARATOR")) { if (SeparatorResult->equals_lower("SEPARATOR")) {
List.addDefinition(make_unique<MenuSeparator>()); List.addDefinition(llvm::make_unique<MenuSeparator>());
continue; continue;
} }
@ -540,14 +541,14 @@ Expected<MenuDefinitionList> RCParser::parseMenuItemsList() {
if (IsPopup) { if (IsPopup) {
// If POPUP, read submenu items recursively. // If POPUP, read submenu items recursively.
ASSIGN_OR_RETURN(SubMenuResult, parseMenuItemsList()); ASSIGN_OR_RETURN(SubMenuResult, parseMenuItemsList());
List.addDefinition(make_unique<PopupItem>(*CaptionResult, *FlagsResult, List.addDefinition(llvm::make_unique<PopupItem>(
std::move(*SubMenuResult))); *CaptionResult, *FlagsResult, std::move(*SubMenuResult)));
continue; continue;
} }
assert(IsMenuItem); assert(IsMenuItem);
List.addDefinition( List.addDefinition(
make_unique<MenuItem>(*CaptionResult, MenuResult, *FlagsResult)); llvm::make_unique<MenuItem>(*CaptionResult, MenuResult, *FlagsResult));
} }
return std::move(List); return std::move(List);
@ -557,7 +558,8 @@ RCParser::ParseType RCParser::parseStringTableResource() {
ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements()); ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements());
RETURN_IF_ERROR(consumeType(Kind::BlockBegin)); RETURN_IF_ERROR(consumeType(Kind::BlockBegin));
auto Table = make_unique<StringTableResource>(std::move(*OptStatements)); auto Table =
llvm::make_unique<StringTableResource>(std::move(*OptStatements));
// Read strings until we reach the end of the block. // Read strings until we reach the end of the block.
while (!consumeOptionalType(Kind::BlockEnd)) { while (!consumeOptionalType(Kind::BlockEnd)) {
@ -640,34 +642,34 @@ RCParser::parseVersionInfoFixed() {
RCParser::ParseOptionType RCParser::parseLanguageStmt() { RCParser::ParseOptionType RCParser::parseLanguageStmt() {
ASSIGN_OR_RETURN(Args, readIntsWithCommas(/* min = */ 2, /* max = */ 2)); ASSIGN_OR_RETURN(Args, readIntsWithCommas(/* min = */ 2, /* max = */ 2));
return make_unique<LanguageResource>((*Args)[0], (*Args)[1]); return llvm::make_unique<LanguageResource>((*Args)[0], (*Args)[1]);
} }
RCParser::ParseOptionType RCParser::parseCharacteristicsStmt() { RCParser::ParseOptionType RCParser::parseCharacteristicsStmt() {
ASSIGN_OR_RETURN(Arg, readInt()); ASSIGN_OR_RETURN(Arg, readInt());
return make_unique<CharacteristicsStmt>(*Arg); return llvm::make_unique<CharacteristicsStmt>(*Arg);
} }
RCParser::ParseOptionType RCParser::parseVersionStmt() { RCParser::ParseOptionType RCParser::parseVersionStmt() {
ASSIGN_OR_RETURN(Arg, readInt()); ASSIGN_OR_RETURN(Arg, readInt());
return make_unique<VersionStmt>(*Arg); return llvm::make_unique<VersionStmt>(*Arg);
} }
RCParser::ParseOptionType RCParser::parseCaptionStmt() { RCParser::ParseOptionType RCParser::parseCaptionStmt() {
ASSIGN_OR_RETURN(Arg, readString()); ASSIGN_OR_RETURN(Arg, readString());
return make_unique<CaptionStmt>(*Arg); return llvm::make_unique<CaptionStmt>(*Arg);
} }
RCParser::ParseOptionType RCParser::parseFontStmt() { RCParser::ParseOptionType RCParser::parseFontStmt() {
ASSIGN_OR_RETURN(SizeResult, readInt()); ASSIGN_OR_RETURN(SizeResult, readInt());
RETURN_IF_ERROR(consumeType(Kind::Comma)); RETURN_IF_ERROR(consumeType(Kind::Comma));
ASSIGN_OR_RETURN(NameResult, readString()); ASSIGN_OR_RETURN(NameResult, readString());
return make_unique<FontStmt>(*SizeResult, *NameResult); return llvm::make_unique<FontStmt>(*SizeResult, *NameResult);
} }
RCParser::ParseOptionType RCParser::parseStyleStmt() { RCParser::ParseOptionType RCParser::parseStyleStmt() {
ASSIGN_OR_RETURN(Arg, readInt()); ASSIGN_OR_RETURN(Arg, readInt());
return make_unique<StyleStmt>(*Arg); return llvm::make_unique<StyleStmt>(*Arg);
} }
Error RCParser::getExpectedError(const Twine Message, bool IsAlreadyRead) { Error RCParser::getExpectedError(const Twine Message, bool IsAlreadyRead) {