From 3a947631019015b5d149a5afbba6914d56ca05e7 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 27 Apr 2016 17:26:08 +0000 Subject: Revert r267691, it caused PR27535. llvm-svn: 267744 --- clang/test/Modules/Inputs/PR27401/a.h | 17 ---------- clang/test/Modules/Inputs/PR27401/b.h | 21 ------------ clang/test/Modules/Inputs/PR27401/module.modulemap | 1 - clang/test/Modules/pr27401.cpp | 38 ---------------------- 4 files changed, 77 deletions(-) delete mode 100644 clang/test/Modules/Inputs/PR27401/a.h delete mode 100644 clang/test/Modules/Inputs/PR27401/b.h delete mode 100644 clang/test/Modules/Inputs/PR27401/module.modulemap delete mode 100644 clang/test/Modules/pr27401.cpp (limited to 'clang/test/Modules') 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 -struct integral_constant { - static const _Tp value = _Tp(); -}; - -template -struct is_nothrow_default_constructible - : integral_constant {}; - -template -struct is_nothrow_move_constructible - : integral_constant {}; - -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 __vector_base { -protected: - _Allocator __alloc() const; - __vector_base(_Allocator); -}; - -template -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 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 __vector_base { -protected: - _Allocator __alloc() const; - __vector_base(_Allocator); -}; - -template -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 -vector<_Tp, _Allocator>::vector(const vector &__x) : __vector_base<_Tp, _Allocator>(__x.__alloc()) {} - - struct CommentOptions { - vector ParseAllComments; - CommentOptions() {} - }; - struct PrintingPolicy { - PrintingPolicy(CommentOptions LO) : LangOpts(LO) {} - CommentOptions LangOpts; - }; - -#include "b.h" -CommentOptions fn1() { return fn1(); } - -// expected-no-diagnostics -- cgit v1.2.3