This is an archive of the discontinued LLVM Phabricator instance.

Differential D92957

ExpressionParser: Migrate to FileEntryRef in ParseInternal, NFC
ClosedPublic

Authored by dexonsmith on Dec 9 2020, 11:47 AM.

Details

Reviewers
teemperor
jansvoboda11
arphaman
Commits
rG8b6aedc4c99a: ExpressionParser: Migrate to FileEntryRef in ParseInternal, NFC
Summary

Migrate to the FileEntryRef overload of SourceManager::createFileID
(using FileManager::getOptionalFileRef) in
ClangExpressionParser::ParseInternal.

No functionality change here.

Diff Detail

Event Timeline

dexonsmith created this revision.Dec 9 2020, 11:47 AM
Herald added a subscriber: ributzka. · View Herald TranscriptDec 9 2020, 11:47 AM
dexonsmith requested review of this revision.Dec 9 2020, 11:47 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 9 2020, 11:47 AM
dexonsmith added a reviewer: teemperor.Dec 9 2020, 11:47 AM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptDec 9 2020, 11:47 AM
Harbormaster completed remote builds in B81676: Diff 310594.Dec 9 2020, 12:31 PM
dexonsmith added a child revision: D92984: SourceManager: Change getOrCreateFileID API to take FileEntryRef, NFC.Dec 9 2020, 5:03 PM
dexonsmith added reviewers: jansvoboda11, arphaman.Dec 10 2020, 11:10 AM
jansvoboda11 accepted this revision.Dec 11 2020, 7:31 AM

LGTM.

This revision is now accepted and ready to land.Dec 11 2020, 7:31 AM
teemperor accepted this revision.Dec 11 2020, 7:37 AM
This revision was landed with ongoing or failed builds.Jan 25 2021, 4:40 PM
Closed by commit rG8b6aedc4c99a: ExpressionParser: Migrate to FileEntryRef in ParseInternal, NFC (authored by dexonsmith). · Explain Why
This revision was automatically updated to reflect the committed changes.
dexonsmith added a commit: rG8b6aedc4c99a: ExpressionParser: Migrate to FileEntryRef in ParseInternal, NFC.

Revision Contents

PathSize
lldb/
source/
Plugins/
ExpressionParser/
Clang/
4 lines

Diff 319165

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp

Show First 20 Lines • Show All 1,067 Lines • ▼ Show 20 Lines if (should_create_file) {
if (temp_fd != -1) { if (temp_fd != -1) {
lldb_private::NativeFile file(temp_fd, File::eOpenOptionWrite, true); lldb_private::NativeFile file(temp_fd, File::eOpenOptionWrite, true);
const size_t expr_text_len = strlen(expr_text); const size_t expr_text_len = strlen(expr_text);
size_t bytes_written = expr_text_len; size_t bytes_written = expr_text_len;
if (file.Write(expr_text, bytes_written).Success()) { if (file.Write(expr_text, bytes_written).Success()) {
if (bytes_written == expr_text_len) { if (bytes_written == expr_text_len) {
file.Close(); file.Close();
if (auto fileEntry = if (auto fileEntry = m_compiler->getFileManager().getOptionalFileRef(
m_compiler->getFileManager().getFile(result_path)) { result_path)) {
source_mgr.setMainFileID(source_mgr.createFileID( source_mgr.setMainFileID(source_mgr.createFileID(
*fileEntry, *fileEntry,
SourceLocation(), SrcMgr::C_User)); SourceLocation(), SrcMgr::C_User));
created_main_file = true; created_main_file = true;
} }
} }
} }
} }
▲ Show 20 Lines • Show All 455 Lines • Show Last 20 Lines