From e377bb82624e32b8d0cbbcb7eec6f469d15702b9 Mon Sep 17 00:00:00 2001 From: SKill Date: Wed, 5 Nov 2025 11:42:14 +0100 Subject: [PATCH] Slight refactoring of CGDebugInfo::getOrCreateFile. It's a non-functional change. --- clang/lib/CodeGen/CGDebugInfo.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index ca579c915f49d..8a3180a099d17 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -565,20 +565,20 @@ llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) { FileID FID; std::optional> 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(); } @@ -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(