maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't compare llvm::Optional<> objects directly; compare their 

contents when it's safe. I just *love* C++ some days.

llvm-svn: 125378
This commit is contained in:
Douglas Gregor 2011-02-11 18:08:15 +00:00
parent 485b4d8352
commit 6a5be93b81
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clang/lib/Basic/SourceManager.cpp
View File

@ -1145,16 +1145,19 @@ SourceLocation SourceManager::getLocation(const FileEntry *SourceFile,
if (MainSLoc.isFile()) {
const ContentCache *MainContentCache
= MainSLoc.getFile().getContentCache();
if (MainContentCache->Entry == SourceFile)
if (!MainContentCache) {
// Can't do anything
} else if (MainContentCache->Entry == SourceFile) {
FirstFID = MainFileID;
else if (MainContentCache) {
} else {
// Fall back: check whether we have the same base name and inode
// as the main file.
const FileEntry *MainFile = MainContentCache->Entry;
SourceFileName = llvm::sys::path::filename(SourceFile->getName());
if (*SourceFileName == llvm::sys::path::filename(MainFile->getName())) {
SourceFileInode = getActualFileInode(SourceFile);
if (SourceFileInode == getActualFileInode(MainFile)) {
if (SourceFileInode &&
*SourceFileInode == getActualFileInode(MainFile)) {
FirstFID = MainFileID;
SourceFile = MainFile;
}
@ -1192,11 +1195,14 @@ SourceLocation SourceManager::getLocation(const FileEntry *SourceFile,
= SLoc.getFile().getContentCache();
const FileEntry *Entry =FileContentCache? FileContentCache->Entry : 0;
if (Entry &&
*SourceFileName == llvm::sys::path::filename(Entry->getName()) &&
SourceFileInode == getActualFileInode(Entry)) {
FirstFID = FileID::get(I);
SourceFile = Entry;
break;
*SourceFileName == llvm::sys::path::filename(Entry->getName())) {
if (llvm::Optional<ino_t> EntryInode = getActualFileInode(Entry)) {
if (*SourceFileInode == *EntryInode) {
FirstFID = FileID::get(I);
SourceFile = Entry;
break;
}
}
}
}
}