diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-04-27 17:26:08 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-04-27 17:26:08 +0000 |
| commit | 3a947631019015b5d149a5afbba6914d56ca05e7 (patch) | |
| tree | 65bb8b65c3333b5c60667be60f42714835054473 /clang/test/Modules | |
| parent | 7efdca5622cfd472ccca6fd2b0b830e526abbd48 (diff) | |
| download | bcm5719-llvm-3a947631019015b5d149a5afbba6914d56ca05e7.tar.gz bcm5719-llvm-3a947631019015b5d149a5afbba6914d56ca05e7.zip | |
Revert r267691, it caused PR27535.
llvm-svn: 267744
Diffstat (limited to 'clang/test/Modules')
| -rw-r--r-- | clang/test/Modules/Inputs/PR27401/a.h | 17 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/PR27401/b.h | 21 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/PR27401/module.modulemap | 1 | ||||
| -rw-r--r-- | clang/test/Modules/pr27401.cpp | 38 |
4 files changed, 0 insertions, 77 deletions
diff --git a/clang/test/Modules/Inputs/PR27401/a.h b/clang/test/Modules/Inputs/PR27401/a.h deleted file mode 100644 index 63d6b707f46..00000000000 --- a/clang/test/Modules/Inputs/PR27401/a.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _LIBCPP_ALGORITHM -#define _LIBCPP_ALGORITHM -template <class _Tp, _Tp> -struct integral_constant { - static const _Tp value = _Tp(); -}; - -template <class _Tp> -struct is_nothrow_default_constructible - : integral_constant<bool, __is_constructible(_Tp)> {}; - -template <class _Tp> -struct is_nothrow_move_constructible - : integral_constant<bool, __is_constructible(_Tp, _Tp)> {}; - -class allocator {}; -#endif diff --git a/clang/test/Modules/Inputs/PR27401/b.h b/clang/test/Modules/Inputs/PR27401/b.h deleted file mode 100644 index 2b4e7f14fbb..00000000000 --- a/clang/test/Modules/Inputs/PR27401/b.h +++ /dev/null @@ -1,21 +0,0 @@ -#include "a.h" -#ifndef _LIBCPP_VECTOR -template <class, class _Allocator> -class __vector_base { -protected: - _Allocator __alloc() const; - __vector_base(_Allocator); -}; - -template <class _Tp, class _Allocator = allocator> -class vector : __vector_base<_Tp, _Allocator> { -public: - vector() noexcept(is_nothrow_default_constructible<_Allocator>::value); - vector(const vector &); - vector(vector &&) - noexcept(is_nothrow_move_constructible<_Allocator>::value); -}; - -#endif -void GetUniquePtrType() { vector<char> v; } - diff --git a/clang/test/Modules/Inputs/PR27401/module.modulemap b/clang/test/Modules/Inputs/PR27401/module.modulemap deleted file mode 100644 index a0efadaa0ea..00000000000 --- a/clang/test/Modules/Inputs/PR27401/module.modulemap +++ /dev/null @@ -1 +0,0 @@ -module "b" { header "b.h" export * } diff --git a/clang/test/Modules/pr27401.cpp b/clang/test/Modules/pr27401.cpp deleted file mode 100644 index 7d5479cb924..00000000000 --- a/clang/test/Modules/pr27401.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// RUN: rm -rf %t -// RUN: %clang_cc1 -std=c++11 -I%S/Inputs/PR27401 -verify %s -// RUN: %clang_cc1 -std=c++11 -fmodules -fmodule-map-file=%S/Inputs/PR27401/module.modulemap -fmodules-cache-path=%t -I%S/Inputs/PR27401 -verify %s - -#include "a.h" -#define _LIBCPP_VECTOR -template <class, class _Allocator> -class __vector_base { -protected: - _Allocator __alloc() const; - __vector_base(_Allocator); -}; - -template <class _Tp, class _Allocator = allocator> -class vector : __vector_base<_Tp, _Allocator> { -public: - vector() noexcept(is_nothrow_default_constructible<_Allocator>::value); - vector(const vector &); - vector(vector &&) - noexcept(is_nothrow_move_constructible<_Allocator>::value); -}; - -template <class _Tp, class _Allocator> -vector<_Tp, _Allocator>::vector(const vector &__x) : __vector_base<_Tp, _Allocator>(__x.__alloc()) {} - - struct CommentOptions { - vector<char> ParseAllComments; - CommentOptions() {} - }; - struct PrintingPolicy { - PrintingPolicy(CommentOptions LO) : LangOpts(LO) {} - CommentOptions LangOpts; - }; - -#include "b.h" -CommentOptions fn1() { return fn1(); } - -// expected-no-diagnostics |

