This is an archive of the discontinued LLVM Phabricator instance.

This call-site should have been updated as part of D34304.
ClosedPublic

Authored by saugustine on Jul 6 2017, 3:42 PM.

Download Raw Diff

Details

Reviewers

Commits

rG6b030ab46171: This call-site should have been updated as part of D34304.
rC307329: This call-site should have been updated as part of D34304.
rL307329: This call-site should have been updated as part of D34304.

Summary

Use an argument adjuster to preserve behavior inadvertantly changed by D34304.

Diff Detail

Repository: rL LLVM

Event Timeline

saugustine created this revision.Jul 6 2017, 3:42 PM

Harbormaster completed remote builds in B8029: Diff 105555.Jul 6 2017, 3:42 PM

Submitting for post-commit review. As this will fix a broken build.

Closed by commit rL307329: This call-site should have been updated as part of D34304. (authored by saugustine). · Explain WhyJul 6 2017, 3:47 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

cfe/

trunk/

lib/

Tooling/

Tooling.cpp

8 lines

Diff 105556

cfe/trunk/lib/Tooling/Tooling.cpp

Show First 20 Lines • Show All 133 Lines • ▼ Show 20 Lines	bool runToolOnCodeWithArgs(
StringRef FileNameRef = FileName.toNullTerminatedStringRef(FileNameStorage);		StringRef FileNameRef = FileName.toNullTerminatedStringRef(FileNameStorage);
llvm::IntrusiveRefCntPtr<vfs::OverlayFileSystem> OverlayFileSystem(		llvm::IntrusiveRefCntPtr<vfs::OverlayFileSystem> OverlayFileSystem(
new vfs::OverlayFileSystem(vfs::getRealFileSystem()));		new vfs::OverlayFileSystem(vfs::getRealFileSystem()));
llvm::IntrusiveRefCntPtr<vfs::InMemoryFileSystem> InMemoryFileSystem(		llvm::IntrusiveRefCntPtr<vfs::InMemoryFileSystem> InMemoryFileSystem(
new vfs::InMemoryFileSystem);		new vfs::InMemoryFileSystem);
OverlayFileSystem->pushOverlay(InMemoryFileSystem);		OverlayFileSystem->pushOverlay(InMemoryFileSystem);
llvm::IntrusiveRefCntPtr<FileManager> Files(		llvm::IntrusiveRefCntPtr<FileManager> Files(
new FileManager(FileSystemOptions(), OverlayFileSystem));		new FileManager(FileSystemOptions(), OverlayFileSystem));
ToolInvocation Invocation(getSyntaxOnlyToolArgs(ToolName, Args, FileNameRef),		ArgumentsAdjuster Adjuster = getClangStripDependencyFileAdjuster();
		ToolInvocation Invocation(
		getSyntaxOnlyToolArgs(ToolName, Adjuster(Args, FileNameRef), FileNameRef),
ToolAction, Files.get(),		ToolAction, Files.get(),
std::move(PCHContainerOps));		std::move(PCHContainerOps));

SmallString<1024> CodeStorage;		SmallString<1024> CodeStorage;
InMemoryFileSystem->addFile(FileNameRef, 0,		InMemoryFileSystem->addFile(FileNameRef, 0,
llvm::MemoryBuffer::getMemBuffer(		llvm::MemoryBuffer::getMemBuffer(
Code.toNullTerminatedStringRef(CodeStorage)));		Code.toNullTerminatedStringRef(CodeStorage)));

for (auto &FilenameWithContent : VirtualMappedFiles) {		for (auto &FilenameWithContent : VirtualMappedFiles) {
InMemoryFileSystem->addFile(		InMemoryFileSystem->addFile(
▲ Show 20 Lines • Show All 391 Lines • Show Last 20 Lines