shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[Preprocessor] Fix crash emitting note with framework location for "file not found" error.

Browse Source 
A filename can be remapped with a header map to point to a framework
header and we can find the corresponding framework without the header.
But if the original filename doesn't have a remapped framework name,
we'll fail to find its location and will dereference a null pointer
during diagnostics emission.

Fix by tracking remappings better and emit the note only if a framework
is found before any of the remappings.

rdar://problem/48883447

Reviewers: arphaman, erik.pilkington, jkorous

Reviewed By: arphaman

Subscribers: dexonsmith, cfe-commits

Differential Revision: https://reviews.llvm.org/D61707

llvm-svn: 361779
This commit is contained in:
Volodymyr Sapsai 2019-05-27 19:15:30 +00:00
parent e13ae3e4d8
commit e32ff09685
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/Lex/HeaderSearch.h
View File

@ -392,8 +392,9 @@ public:
/// true.
///
/// \param IsFrameworkFound If non-null, will be set to true if a framework is
/// found in any of searched SearchDirs. Doesn't guarantee the requested file
/// is found.
/// found in any of searched SearchDirs. Will be set to false if a framework
/// is found only through header maps. Doesn't guarantee the requested file is
/// found.
const FileEntry *LookupFile(
StringRef Filename, SourceLocation IncludeLoc, bool isAngled,
const DirectoryLookup *FromDir, const DirectoryLookup *&CurDir,

5
clang/lib/Lex/HeaderSearch.cpp
View File

@ -869,7 +869,10 @@ const FileEntry *HeaderSearch::LookupFile(
*IsMapped = true;
}
if (IsFrameworkFound)
*IsFrameworkFound |= IsFrameworkFoundInDir;
// Because we keep a filename remapped for subsequent search directory
// lookups, ignore IsFrameworkFoundInDir after the first remapping and not
// just for remapping in a current search directory.
*IsFrameworkFound |= (IsFrameworkFoundInDir && !CacheLookup.MappedName);
if (!FE) continue;
CurDir = &SearchDirs[i];

7
clang/test/Preprocessor/Inputs/include-header-missing-in-framework/TestFramework.hmap.json Normal file
View File

@ -0,0 +1,7 @@
{
"mappings" :
{
"RemappedHeader.h" : "TestFramework/RemappedHeader.h",
"TestFramework/BeforeRemapping.h" : "TestFramework/AfterRemapping.h"
}
}

20
clang/test/Preprocessor/include-header-missing-in-framework-with-headermap.c Normal file
View File

@ -0,0 +1,20 @@
// RUN: rm -f %t.hmap
// RUN: %hmaptool write %S/Inputs/include-header-missing-in-framework/TestFramework.hmap.json %t.hmap
// RUN: %clang_cc1 -fsyntax-only -F %S/Inputs -I %t.hmap -verify %s -DLATE_REMAPPING
// RUN: %clang_cc1 -fsyntax-only -I %t.hmap -F %S/Inputs -verify %s
// The test is similar to 'include-header-missing-in-framework.c' but covers
// the case when a header is remapped to a framework-like path with a .hmap
// file. And we can find the framework but not the header.
#ifdef LATE_REMAPPING
// Framework is found before remapping.
#include <TestFramework/BeforeRemapping.h>
// expected-error@-1 {{'TestFramework/BeforeRemapping.h' file not found}}
// expected-note@-2 {{did not find header 'BeforeRemapping.h' in framework 'TestFramework' (loaded from}}
#else
// Framework is found after remapping.
#include "RemappedHeader.h"
// expected-error@-1 {{'RemappedHeader.h' file not found}}
#endif // LATE_REMAPPING