diff options
| author | dim <dim@FreeBSD.org> | 2015-01-18 16:23:48 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-01-18 16:23:48 +0000 |
| commit | c86b984ea8ecb3e944dc3de48539f4c1f65851ea (patch) | |
| tree | 3eb853da77d46cc77c4b017525a422f9ddb1385b /test/Modules/Inputs/merge-using-decls | |
| parent | c696171ff15f0ee60dea4abfd99a135473c95656 (diff) | |
| download | FreeBSD-src-c86b984ea8ecb3e944dc3de48539f4c1f65851ea.zip FreeBSD-src-c86b984ea8ecb3e944dc3de48539f4c1f65851ea.tar.gz | |
Vendor import of clang RELEASE_360/rc1 tag r226102 (effectively, 3.6.0 RC1):
https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc1@226102
Diffstat (limited to 'test/Modules/Inputs/merge-using-decls')
| -rw-r--r-- | test/Modules/Inputs/merge-using-decls/a.h | 43 | ||||
| -rw-r--r-- | test/Modules/Inputs/merge-using-decls/b.h | 50 | ||||
| -rw-r--r-- | test/Modules/Inputs/merge-using-decls/module.modulemap | 2 |
3 files changed, 95 insertions, 0 deletions
diff --git a/test/Modules/Inputs/merge-using-decls/a.h b/test/Modules/Inputs/merge-using-decls/a.h new file mode 100644 index 0000000..0fe0067 --- /dev/null +++ b/test/Modules/Inputs/merge-using-decls/a.h @@ -0,0 +1,43 @@ +struct X { + int v; + typedef int t; +}; + +struct YA { + int value; + typedef int type; +}; + +template<typename T> struct C : X, T { + using T::value; + using typename T::type; + using X::v; + using typename X::t; +}; + +template<typename T> struct D : X, T { + using T::value; + using typename T::type; + using X::v; + using typename X::t; +}; + +template<typename T> struct E : X, T { + using T::value; + using typename T::type; + using X::v; + using typename X::t; +}; + +template<typename T> struct F : X, T { + using T::value; + using typename T::type; + using X::v; + using typename X::t; +}; + +// Force instantiation. +typedef C<YA>::type I; +typedef D<YA>::type I; +typedef E<YA>::type I; +typedef F<YA>::type I; diff --git a/test/Modules/Inputs/merge-using-decls/b.h b/test/Modules/Inputs/merge-using-decls/b.h new file mode 100644 index 0000000..3595555 --- /dev/null +++ b/test/Modules/Inputs/merge-using-decls/b.h @@ -0,0 +1,50 @@ +struct X { + int v; + typedef int t; +}; + +struct YB { + typedef YB Y; + int value; + typedef int type; +}; + +struct YBRev { + typedef int value; + int type; +}; + +template<typename T> struct C : X, T { + using T::value; + using typename T::type; + using X::v; + using typename X::t; +}; + +template<typename T> struct D : X, T { + // Mismatch in type/non-type-ness. + using typename T::value; + using T::type; + using X::v; + using typename X::t; +}; + +template<typename T> struct E : X, T { + // Mismatch in using/access-declaration-ness. + T::value; + X::v; +}; + +template<typename T> struct F : X, T { + // Mismatch in nested-name-specifier. + using T::Y::value; + using typename T::Y::type; + using ::X::v; + using typename ::X::t; +}; + +// Force instantiation. +typedef C<YB>::type I; +typedef D<YBRev>::t I; +typedef E<YB>::type I; +typedef F<YB>::type I; diff --git a/test/Modules/Inputs/merge-using-decls/module.modulemap b/test/Modules/Inputs/merge-using-decls/module.modulemap new file mode 100644 index 0000000..a415527 --- /dev/null +++ b/test/Modules/Inputs/merge-using-decls/module.modulemap @@ -0,0 +1,2 @@ +module A { header "a.h" } +module B { header "b.h" } |
