This is an archive of the discontinued LLVM Phabricator instance.

Differential D64857

[clangd] Force the required interpretation of #import on windows tests.
ClosedPublic

Authored by sammccall on Jul 17 2019, 2:56 AM.

Details

Reviewers
kadircet
Commits
rG2889fe67691b: [clangd] Force the required interpretation of #import on windows tests.
rCTE366321: [clangd] Force the required interpretation of #import on windows tests.
rL366321: [clangd] Force the required interpretation of #import on windows tests.
Summary

NFC but should fix a bunch of tests.

Diff Detail

Event Timeline

sammccall created this revision.Jul 17 2019, 2:56 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 17 2019, 2:56 AM
Herald added subscribers: llvm-commits, arphaman, jkorous and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B35157: Diff 210279.Jul 17 2019, 2:56 AM
kadircet accepted this revision.Jul 17 2019, 6:00 AM
This revision is now accepted and ready to land.Jul 17 2019, 6:00 AM
Closed by commit rL366321: [clangd] Force the required interpretation of #import on windows tests. (authored by sammccall). · Explain WhyJul 17 2019, 6:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang-tools-extra/
clangd/
unittests/
4 lines

Diff 210279

clang-tools-extra/clangd/unittests/TestTU.cpp

Show All 32 LinesParsedAST TestTU::build() const {
std::vector<const char *> Cmd = {"clang"}; std::vector<const char *> Cmd = {"clang"};
// FIXME: this shouldn't need to be conditional, but it breaks a // FIXME: this shouldn't need to be conditional, but it breaks a
// GoToDefinition test for some reason (getMacroArgExpandedLocation fails). // GoToDefinition test for some reason (getMacroArgExpandedLocation fails).
if (!HeaderCode.empty()) { if (!HeaderCode.empty()) {
Cmd.push_back("-include"); Cmd.push_back("-include");
Cmd.push_back(ImplicitHeaderGuard ? ImportThunk.c_str() Cmd.push_back(ImplicitHeaderGuard ? ImportThunk.c_str()
: FullHeaderName.c_str()); : FullHeaderName.c_str());
// ms-compatibility changes the meaning of #import.
// The default is OS-dependent (on on windows), ensure it's off.
if (ImplicitHeaderGuard)
Cmd.push_back("-fno-ms-compatibility");
} }
Cmd.insert(Cmd.end(), ExtraArgs.begin(), ExtraArgs.end()); Cmd.insert(Cmd.end(), ExtraArgs.begin(), ExtraArgs.end());
// Put the file name at the end -- this allows the extra arg (-xc++) to // Put the file name at the end -- this allows the extra arg (-xc++) to
// override the language setting. // override the language setting.
Cmd.push_back(FullFilename.c_str()); Cmd.push_back(FullFilename.c_str());
ParseInputs Inputs; ParseInputs Inputs;
Inputs.CompileCommand.Filename = FullFilename; Inputs.CompileCommand.Filename = FullFilename;
Inputs.CompileCommand.CommandLine = {Cmd.begin(), Cmd.end()}; Inputs.CompileCommand.CommandLine = {Cmd.begin(), Cmd.end()};
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines