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

[OpenMP] Fix deleted move constructor failing on some compiles 

Summary:
A previous commit added some new errors that were not correctly casted
to an r-value. This doesn't work on some compilers.
This commit is contained in:
Joseph Huber 2022-04-19 18:40:15 -04:00
parent 260c5df2d5
commit dbb10f7097
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
View File

@ -433,7 +433,7 @@ extractFromBinary(const ObjectFile &Obj,
StripArgs.push_back(TempFile);
if (Error Err = executeCommands(*StripPath, StripArgs))
return Err;
return std::move(Err);
return static_cast<std::string>(TempFile);
}
@ -634,7 +634,7 @@ Expected<std::string> assemble(StringRef InputFile, Triple TheTriple,
printCommands(CmdArgs);
if (Error Err = executeCommands(*PtxasPath, CmdArgs))
return Err;
return std::move(Err);
return static_cast<std::string>(TempFile);
}
@ -674,7 +674,7 @@ Expected<std::string> link(ArrayRef<std::string> InputFiles, Triple TheTriple,
printCommands(CmdArgs);
if (Error Err = executeCommands(*NvlinkPath, CmdArgs))
return Err;
return std::move(Err);
return static_cast<std::string>(TempFile);
}
@ -711,7 +711,7 @@ Expected<std::string> link(ArrayRef<std::string> InputFiles, Triple TheTriple,
printCommands(CmdArgs);
if (Error Err = executeCommands(*LLDPath, CmdArgs))
return Err;
return std::move(Err);
return static_cast<std::string>(TempFile);
}
@ -791,7 +791,7 @@ Expected<std::string> link(ArrayRef<std::string> InputFiles, Triple TheTriple,
printCommands(CmdArgs);
if (Error Err = executeCommands(LinkerUserPath, CmdArgs))
return Err;
return std::move(Err);
return static_cast<std::string>(TempFile);
}