Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Track skipped files in dependency scanning.
It's possible for a header to be a symlink to another header. In this case both will be represented by clang::FileEntry with the same UID and they'll use the same clang::HeaderFileInfo. If you include both headers and use some single-inclusion mechanism like a header guard or #import, one header will get a FileChanged callback, and another FileSkipped. So that we get an accurate dependency file, we therefore need to also implement the FileSkipped callback in dependency scanning. Patch by Pete Cooper. Reviewers: bruno, pete Reviewed By: bruno Subscribers: cfe-commits, jkorous, vsapsai Differential Revision: https://reviews.llvm.org/D30881 llvm-svn: 331319
- Loading branch information
Showing
3 changed files
with
41 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
clang/test/Frontend/Inputs/SystemHeaderPrefix/with-header-guard.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
#ifndef HEADER_GUARD | ||
#define HEADER_GUARD | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// REQUIRES: shell | ||
|
||
// Basic test | ||
// RUN: rm -rf %t.dir | ||
// RUN: mkdir %t.dir | ||
// RUN: mkdir %t.dir/a | ||
// RUN: mkdir %t.dir/b | ||
// RUN: echo "#ifndef HEADER_A" > %t.dir/a/header.h | ||
// RUN: echo "#define HEADER_A" >> %t.dir/a/header.h | ||
// RUN: echo "#endif" >> %t.dir/a/header.h | ||
// RUN: ln -s %t.dir/a/header.h %t.dir/b/header.h | ||
|
||
// RUN: %clang_cc1 -dependency-file %t.dir/file.deps -MT %s.o %s -fsyntax-only -I %t.dir -isystem %S/Inputs/SystemHeaderPrefix | ||
// RUN: FileCheck -input-file=%t.dir/file.deps %s | ||
// CHECK: dependency-gen-symlink.c.o | ||
// CHECK: dependency-gen-symlink.c | ||
// CHECK: a/header.h | ||
// CHECK: b/header.h | ||
// CHECK-NOT: with-header-guard.h | ||
#include "a/header.h" | ||
#include "b/header.h" | ||
// System header shouldn't be included in dependencies. | ||
#include <with-header-guard.h> | ||
#include <with-header-guard.h> |