diff options
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/Modules/Inputs/redecl-merge-left.h | 5 | ||||
| -rw-r--r-- | clang/test/Modules/redecl-merge.m | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/redecl-merge-left.h b/clang/test/Modules/Inputs/redecl-merge-left.h index 632125ddb11..798aa83b503 100644 --- a/clang/test/Modules/Inputs/redecl-merge-left.h +++ b/clang/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/clang/test/Modules/redecl-merge.m b/clang/test/Modules/redecl-merge.m index e6de22a85aa..cb44a13d184 100644 --- a/clang/test/Modules/redecl-merge.m +++ b/clang/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; |
