replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang-cl: Don't store the cl compiler Tool on the stack (PR20131) 

The Command will refer back to the Tool as its source,
so it has to outlive the Command.

Having the Tool on the stack would cause us to crash
when using "clang-cl -GR -fallback", because if the
Command fails, Driver::ExecuteCompilation tries to
peek at the Command's source.

Differential Revision: http://reviews.llvm.org/D4314

llvm-svn: 211802
This commit is contained in:
Hans Wennborg 2014-06-26 19:59:02 +00:00
parent ed988fb97d
commit 1da044a4da
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/Driver/Tools.cpp
View File

@ -4184,9 +4184,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
if (Args.hasArg(options::OPT__SLASH_fallback) &&
Output.getType() == types::TY_Object &&
(InputType == types::TY_C || InputType == types::TY_CXX)) {
tools::visualstudio::Compile CL(getToolChain());
Command *CLCommand = CL.GetCommand(C, JA, Output, Inputs, Args,
LinkingOutput);
Command *CLCommand = getCLFallback()->GetCommand(C, JA, Output, Inputs,
Args, LinkingOutput);
// RTTI support in clang-cl is a work in progress. Fall back to MSVC early
// if we are using 'clang-cl /fallback /GR'.
// FIXME: Remove this when RTTI is finished.
@ -4450,6 +4449,12 @@ void Clang::AddClangCLArgs(const ArgList &Args, ArgStringList &CmdArgs) const {
}
}
visualstudio::Compile *Clang::getCLFallback() const {
if (!CLFallback)
CLFallback.reset(new visualstudio::Compile(getToolChain()));
return CLFallback.get();
}
void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
const InputInfo &Output,
const InputInfoList &Inputs,

11
clang/lib/Driver/Tools.h
View File

@ -29,6 +29,11 @@ namespace toolchains {
}
namespace tools {
namespace visualstudio {
class Compile;
}
using llvm::opt::ArgStringList;
/// \brief Clang compiler tool.
@ -78,6 +83,10 @@ using llvm::opt::ArgStringList;
void AddClangCLArgs(const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs) const;
visualstudio::Compile *getCLFallback() const;
mutable std::unique_ptr<visualstudio::Compile> CLFallback;
public:
Clang(const ToolChain &TC) : Tool("clang", "clang frontend", TC) {}
@ -563,7 +572,7 @@ namespace dragonfly {
};
} // end namespace dragonfly
/// Visual studio tools.
/// Visual studio tools.
namespace visualstudio {
class LLVM_LIBRARY_VISIBILITY Link : public Tool {
public: