Skip to content

[clang][DebugInfo] Slight refactoring of getOrCreateFile #166530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −7
Open

[clang][DebugInfo] Slight refactoring of getOrCreateFile #166530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions clang/lib/CodeGen/CGDebugInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,20 +565,20 @@ llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
FileID FID;
std::optional<llvm::DIFile::ChecksumInfo<StringRef>> CSInfo;

llvm::DIFile *CUFile = TheCU->getFile();
if (Loc.isInvalid()) {
// The DIFile used by the CU is distinct from the main source file. Call
// createFile() below for canonicalization if the source file was specified
// with an absolute path.
FileName = TheCU->getFile()->getFilename();
CSInfo = TheCU->getFile()->getChecksum();
FileName = CUFile->getFilename();
CSInfo = CUFile->getChecksum();
FID = SM.getFileID(Loc);
} else {
PresumedLoc PLoc = SM.getPresumedLoc(SM.getFileLoc(Loc));
FileName = PLoc.getFilename();

if (FileName.empty()) {
FileName = TheCU->getFile()->getFilename();
} else {
FileName = PLoc.getFilename();
FileName = CUFile->getFilename();
}
FID = PLoc.getFileID();
}
Expand All @@ -599,8 +599,7 @@ llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
if (CSKind)
CSInfo.emplace(*CSKind, Checksum);
}
return createFile(FileName, CSInfo,
getSource(SM, SM.getFileID(SM.getFileLoc(Loc))));
return createFile(FileName, CSInfo, getSource(SM, FID));
}

llvm::DIFile *CGDebugInfo::createFile(
Expand Down