This is an archive of the discontinued LLVM Phabricator instance.

Differential D92968

Frontend: Migrate to FileEntryRef in TextDiagnosticTest, NFC
ClosedPublic

Authored by dexonsmith on Dec 9 2020, 1:43 PM.

Details

Reviewers
arphaman
jansvoboda11
Commits
rGa60043219907: Frontend: Migrate to FileEntryRef in TextDiagnosticTest, NFC
Summary

Migrate over to the FileEntryRef overloads of
SourceManager::createFileID and overrideFileContents (using
getVirtualFileRef) in TextDiagnostic's ShowLine test.

No functionality change.

Diff Detail

Event Timeline

dexonsmith created this revision.Dec 9 2020, 1:43 PM
Herald added a subscriber: ributzka. · View Herald TranscriptDec 9 2020, 1:43 PM
dexonsmith requested review of this revision.Dec 9 2020, 1:43 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 9 2020, 1:43 PM
Harbormaster completed remote builds in B81704: Diff 310646.Dec 9 2020, 4:17 PM
dexonsmith added a child revision: D92984: SourceManager: Change getOrCreateFileID API to take FileEntryRef, NFC.Dec 9 2020, 5:03 PM
jansvoboda11 accepted this revision.Dec 10 2020, 7:03 AM

LGTM.

This revision is now accepted and ready to land.Dec 10 2020, 7:03 AM
This revision was landed with ongoing or failed builds.Dec 11 2020, 5:07 PM
Closed by commit rGa60043219907: Frontend: Migrate to FileEntryRef in TextDiagnosticTest, NFC (authored by dexonsmith). · Explain Why
This revision was automatically updated to reflect the committed changes.
dexonsmith added a commit: rGa60043219907: Frontend: Migrate to FileEntryRef in TextDiagnosticTest, NFC.

Revision Contents

PathSize
clang/
unittests/
Frontend/
6 lines

Diff 311339

clang/unittests/Frontend/TextDiagnosticTest.cpp

Show All 40 LinesTEST(TextDiagnostic, ShowLine) {
IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs); IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs);
DiagnosticsEngine DiagEngine(DiagID, new DiagnosticOptions, DiagnosticsEngine DiagEngine(DiagID, new DiagnosticOptions,
new IgnoringDiagConsumer()); new IgnoringDiagConsumer());
SourceManager SrcMgr(DiagEngine, FileMgr); SourceManager SrcMgr(DiagEngine, FileMgr);
// Create a dummy file with some contents to produce a test SourceLocation. // Create a dummy file with some contents to produce a test SourceLocation.
const llvm::StringRef file_path = "main.cpp"; const llvm::StringRef file_path = "main.cpp";
const llvm::StringRef main_file_contents = "some\nsource\ncode\n"; const llvm::StringRef main_file_contents = "some\nsource\ncode\n";
const clang::FileEntry &fe = *FileMgr.getVirtualFile( const clang::FileEntryRef fe = FileMgr.getVirtualFileRef(
file_path, file_path,
/*Size=*/static_cast<off_t>(main_file_contents.size()), /*Size=*/static_cast<off_t>(main_file_contents.size()),
/*ModificationTime=*/0); /*ModificationTime=*/0);
llvm::SmallVector<char, 64> buffer; llvm::SmallVector<char, 64> buffer;
buffer.append(main_file_contents.begin(), main_file_contents.end()); buffer.append(main_file_contents.begin(), main_file_contents.end());
auto file_contents = std::make_unique<llvm::SmallVectorMemoryBuffer>( auto file_contents = std::make_unique<llvm::SmallVectorMemoryBuffer>(
std::move(buffer), file_path); std::move(buffer), file_path);
SrcMgr.overrideFileContents(&fe, std::move(file_contents)); SrcMgr.overrideFileContents(fe, std::move(file_contents));
// Create the actual file id and use it as the main file. // Create the actual file id and use it as the main file.
clang::FileID fid = clang::FileID fid =
SrcMgr.createFileID(&fe, SourceLocation(), clang::SrcMgr::C_User); SrcMgr.createFileID(fe, SourceLocation(), clang::SrcMgr::C_User);
SrcMgr.setMainFileID(fid); SrcMgr.setMainFileID(fid);
// Create the source location for the test diagnostic. // Create the source location for the test diagnostic.
FullSourceLoc Loc(SrcMgr.translateLineCol(fid, /*Line=*/1, /*Col=*/2), FullSourceLoc Loc(SrcMgr.translateLineCol(fid, /*Line=*/1, /*Col=*/2),
SrcMgr); SrcMgr);
DiagnosticOptions DiagOpts; DiagnosticOptions DiagOpts;
DiagOpts.ShowLine = true; DiagOpts.ShowLine = true;
Show All 30 Lines