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

Make -Wincomplete-umbrella go through the VFS 

By using vfs::recursive_directory_iterator, this warning will now fire
when some or all of a module's headers are from VFS mappings.

llvm-svn: 211746
This commit is contained in:
Ben Langmuir 2014-06-25 23:53:43 +00:00
parent ae5438701e
commit 54cbc706b1
7 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/VirtualFileSystem.h
View File

@ -200,7 +200,7 @@ public:
bool IsVolatile = false);
/// \brief Get a directory_iterator for \p Dir.
/// \note The 'end' iterator is directory_iterator()
/// \note The 'end' iterator is directory_iterator().
virtual directory_iterator dir_begin(const Twine &Dir,
std::error_code &EC) = 0;
};

8
clang/lib/Lex/PPLexerChange.cpp
View File

@ -455,19 +455,21 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
typedef llvm::sys::fs::recursive_directory_iterator
recursive_directory_iterator;
const DirectoryEntry *Dir = Mod->getUmbrellaDir();
vfs::FileSystem &FS = *FileMgr.getVirtualFileSystem();
std::error_code EC;
for (recursive_directory_iterator Entry(Dir->getName(), EC), End;
for (vfs::recursive_directory_iterator Entry(FS, Dir->getName(), EC), End;
Entry != End && !EC; Entry.increment(EC)) {
using llvm::StringSwitch;
// Check whether this entry has an extension typically associated with
// headers.
if (!StringSwitch<bool>(llvm::sys::path::extension(Entry->path()))
if (!StringSwitch<bool>(llvm::sys::path::extension(Entry->getName()))
.Cases(".h", ".H", ".hh", ".hpp", true)
.Default(false))
continue;
if (const FileEntry *Header = getFileManager().getFile(Entry->path()))
if (const FileEntry *Header =
getFileManager().getFile(Entry->getName()))
if (!getSourceManager().hasFileInfo(Header)) {
if (!ModMap.isHeaderInUnavailableModule(Header)) {
// Find the relative path that would access this header.

1
clang/test/VFS/Inputs/Incomplete.h Normal file
View File

@ -0,0 +1 @@
// does not include IncompleteVFS.h or IncompleteReal.h

1
clang/test/VFS/Inputs/IncompleteVFS.h Normal file
View File

@ -0,0 +1 @@
// IncompleteVFS.h

5
clang/test/VFS/Inputs/incomplete-umbrella.modulemap Normal file
View File

@ -0,0 +1,5 @@
framework module Incomplete {
umbrella header "Incomplete.h"
export *
module * { export * }
}

17
clang/test/VFS/Inputs/vfsoverlay.yaml
View File

@ -29,6 +29,23 @@
},
{ 'name': 'Foo.framework/Headers/Foo.h', 'type': 'file',
'external-contents': 'INPUT_DIR/Foo.h'
},
{ 'name': 'Incomplete.framework', 'type': 'directory',
'contents': [
{ 'name': 'Headers', 'type': 'directory',
'contents': [
{ 'name': 'Incomplete.h', 'type': 'file',
'external-contents': 'INPUT_DIR/Incomplete.h'
},
{ 'name': 'IncompleteVFS.h', 'type': 'file',
'external-contents': 'INPUT_DIR/IncompleteVFS.h'
}
]
},
{ 'name': 'Modules/module.modulemap', 'type': 'file',
'external-contents': 'INPUT_DIR/incomplete-umbrella.modulemap'
}
]
}
]
}

12
clang/test/VFS/incomplete-umbrella.m Normal file
View File

@ -0,0 +1,12 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t/Incomplete.framework/Headers
// RUN: echo '// IncompleteReal.h' > %t/Incomplete.framework/Headers/IncompleteReal.h
// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: not %clang_cc1 -Werror -fmodules -fmodules-cache-path=%t \
// RUN: -ivfsoverlay %t.yaml -F %t -fsyntax-only %s 2>&1 | FileCheck %s
// REQUIRES: shell
@import Incomplete;
// CHECK: umbrella header for module 'Incomplete' {{.*}}IncompleteVFS.h
// CHECK: umbrella header for module 'Incomplete' {{.*}}IncompleteReal.h
// CHECK: could not build module 'Incomplete'