Skip to content

Commit

Permalink
[clang][lex] Fix failures with Microsoft header search rules
Browse files Browse the repository at this point in the history
`HeaderSearch` currently assumes `LookupFileCache` is eventually populated in `LookupFile`. However, that's not always the case with `-fms-compatibility` and its early returns.

This patch adds a defensive check that the iterator pulled out of the cache is actually valid before using it.

(This bug was introduced in D119721. Before that, the cache was initialized to `0` - essentially the `search_dir_begin()` iterator.)

Reviewed By: dexonsmith, erichkeane

Differential Revision: https://reviews.llvm.org/D122237
  • Loading branch information
jansvoboda11 committed Mar 23, 2022
1 parent 9a6e0af commit 59dadd1
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
3 changes: 2 additions & 1 deletion clang/lib/Lex/HeaderSearch.cpp
Expand Up @@ -976,7 +976,8 @@ Optional<FileEntryRef> HeaderSearch::LookupFile(
// this is a matching hit.
if (!SkipCache && CacheLookup.StartIt == NextIt) {
// Skip querying potentially lots of directories for this lookup.
It = CacheLookup.HitIt;
if (CacheLookup.HitIt)
It = CacheLookup.HitIt;
if (CacheLookup.MappedName) {
Filename = CacheLookup.MappedName;
if (IsMapped)
Expand Down
22 changes: 22 additions & 0 deletions clang/test/Preprocessor/microsoft-header-search-fail.c
@@ -0,0 +1,22 @@
// RUN: rm -rf %t
// RUN: split-file %s %t

// RUN: %clang_cc1 -Eonly -fms-compatibility %t/test.c -I %t/include -verify

//--- test.c
#include "x/header.h"
#include "z/header.h"

// expected-warning-re@include/y/header.h:1 {{#include resolved using non-portable Microsoft search rules as: {{.*}}x/culprit.h}}
// expected-error@include/z/header.h:1 {{'culprit.h' file not found}}

//--- include/x/header.h
#include "y/header.h"

//--- include/y/header.h
#include "culprit.h"

//--- include/x/culprit.h

//--- include/z/header.h
#include "culprit.h"

0 comments on commit 59dadd1

Please sign in to comment.