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

clang-cl: Don't check for existence of linker inputs when /link is used 

There might be flags passed to the linker (e.g. /libpath), causing it
to search in paths the Clang driver doesn't know about.

PR27234

llvm-svn: 266402
This commit is contained in:
Hans Wennborg 2016-04-15 01:12:32 +00:00
parent 987c8788d4
commit 12f4f8be90
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clang/lib/Driver/Driver.cpp
View File

@ -1115,7 +1115,7 @@ void Driver::BuildUniversalActions(Compilation &C, const ToolChain &TC,
/// \brief Check that the file referenced by Value exists. If it doesn't, /// \brief Check that the file referenced by Value exists. If it doesn't,
/// issue a diagnostic and return false. /// issue a diagnostic and return false.
static bool DiagnoseInputExistence(const Driver &D, const DerivedArgList &Args, static bool DiagnoseInputExistence(const Driver &D, const DerivedArgList &Args,
StringRef Value) { StringRef Value, types::ID Ty) {
if (!D.getCheckInputsExist()) if (!D.getCheckInputsExist())
return true; return true;
@ -1135,9 +1135,18 @@ static bool DiagnoseInputExistence(const Driver &D, const DerivedArgList &Args,
if (llvm::sys::fs::exists(Twine(Path))) if (llvm::sys::fs::exists(Twine(Path)))
return true; return true;
if (D.IsCLMode() && !llvm::sys::path::is_absolute(Twine(Path)) && if (D.IsCLMode()) {
llvm::sys::Process::FindInEnvPath("LIB", Value)) if (!llvm::sys::path::is_absolute(Twine(Path)) &&
return true; llvm::sys::Process::FindInEnvPath("LIB", Value))
return true;
if (Args.hasArg(options::OPT__SLASH_link) && Ty == types::TY_Object) {
// Arguments to the /link flag might cause the linker to search for object
// and library files in paths we don't know about. Don't error in such
// cases.
return true;
}
}
D.Diag(clang::diag::err_drv_no_such_file) << Path; D.Diag(clang::diag::err_drv_no_such_file) << Path;
return false; return false;
@ -1253,19 +1262,19 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
} }
} }
if (DiagnoseInputExistence(*this, Args, Value)) if (DiagnoseInputExistence(*this, Args, Value, Ty))
Inputs.push_back(std::make_pair(Ty, A)); Inputs.push_back(std::make_pair(Ty, A));
} else if (A->getOption().matches(options::OPT__SLASH_Tc)) { } else if (A->getOption().matches(options::OPT__SLASH_Tc)) {
StringRef Value = A->getValue(); StringRef Value = A->getValue();
if (DiagnoseInputExistence(*this, Args, Value)) { if (DiagnoseInputExistence(*this, Args, Value, types::TY_C)) {
Arg *InputArg = MakeInputArg(Args, Opts, A->getValue()); Arg *InputArg = MakeInputArg(Args, Opts, A->getValue());
Inputs.push_back(std::make_pair(types::TY_C, InputArg)); Inputs.push_back(std::make_pair(types::TY_C, InputArg));
} }
A->claim(); A->claim();
} else if (A->getOption().matches(options::OPT__SLASH_Tp)) { } else if (A->getOption().matches(options::OPT__SLASH_Tp)) {
StringRef Value = A->getValue(); StringRef Value = A->getValue();
if (DiagnoseInputExistence(*this, Args, Value)) { if (DiagnoseInputExistence(*this, Args, Value, types::TY_CXX)) {
Arg *InputArg = MakeInputArg(Args, Opts, A->getValue()); Arg *InputArg = MakeInputArg(Args, Opts, A->getValue());
Inputs.push_back(std::make_pair(types::TY_CXX, InputArg)); Inputs.push_back(std::make_pair(types::TY_CXX, InputArg));
} }

8
clang/test/Driver/cl-link.c
View File

@ -43,3 +43,11 @@
// RUN: %clang_cl /Zi /Tc%s -### 2>&1 | FileCheck --check-prefix=DEBUG %s // RUN: %clang_cl /Zi /Tc%s -### 2>&1 | FileCheck --check-prefix=DEBUG %s
// DEBUG: link.exe // DEBUG: link.exe
// DEBUG: "-debug" // DEBUG: "-debug"
// PR27234
// RUN: %clang_cl /Tc%s nonexistent.obj -### /link /libpath:somepath 2>&1 | FileCheck --check-prefix=NONEXISTENT %s
// RUN: %clang_cl /Tc%s nonexistent.lib -### /link /libpath:somepath 2>&1 | FileCheck --check-prefix=NONEXISTENT %s
// NONEXISTENT-NOT: no such file
// NONEXISTENT: link.exe
// NONEXISTENT: "/libpath:somepath"
// NONEXISTENT: nonexistent