diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-01-13 23:49:34 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-01-13 23:49:34 +0000 |
| commit | 91534a357695fbdf3c136fb04218e37706da73a9 (patch) | |
| tree | f3e2d6568d8c25a09ebba7f721ace62ebc2285f9 /test/Modules | |
| parent | dd9d64547831728dd792654bb26477f5099a2153 (diff) | |
(Implicit) parameters deserialized as part of a function type must not
get added to the identifier chains as part of deserialization, because
they should not be visible to name lookup.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148159 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Modules')
| -rw-r--r-- | test/Modules/Inputs/redecl-merge-left.h | 5 | ||||
| -rw-r--r-- | test/Modules/redecl-merge.m | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/test/Modules/Inputs/redecl-merge-left.h b/test/Modules/Inputs/redecl-merge-left.h index 632125ddb1..798aa83b50 100644 --- a/test/Modules/Inputs/redecl-merge-left.h +++ b/test/Modules/Inputs/redecl-merge-left.h @@ -83,3 +83,8 @@ template<typename T> class Vector; template<typename T> class Vector; #endif + +// Make sure this doesn't introduce an ambiguity-creating 'id' at the +// top level. +typedef void funcptr_with_id(int id); + diff --git a/test/Modules/redecl-merge.m b/test/Modules/redecl-merge.m index e6de22a85a..cb44a13d18 100644 --- a/test/Modules/redecl-merge.m +++ b/test/Modules/redecl-merge.m @@ -146,3 +146,6 @@ void testVector() { } #endif +// Make sure we don't get conflicts with 'id'. +funcptr_with_id fid; +id id_global; |