summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2015-11-30 23:46:32 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2015-11-30 23:46:32 +0000
commit58a7577491f64a57e18e2b2c0a490dc8a3b59ba3 (patch)
treecb8c2442fe1052d054414c6fa787339b8f8c0170 /clang
parentf6ed550f5e21d8e0beee38c5e356172643bfaa9e (diff)
downloadbcm5719-llvm-58a7577491f64a57e18e2b2c0a490dc8a3b59ba3.tar.gz
bcm5719-llvm-58a7577491f64a57e18e2b2c0a490dc8a3b59ba3.zip
[PR25661] Revert part of r217213 according to r254323.
llvm-svn: 254346
Diffstat (limited to 'clang')
-rw-r--r--clang/test/CXX/drs/dr5xx.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/clang/test/CXX/drs/dr5xx.cpp b/clang/test/CXX/drs/dr5xx.cpp
index 0cf67e6b8c2..17b525d9622 100644
--- a/clang/test/CXX/drs/dr5xx.cpp
+++ b/clang/test/CXX/drs/dr5xx.cpp
@@ -519,23 +519,12 @@ namespace dr546 { // dr546: yes
}
namespace dr547 { // dr547: yes
- // When targeting the MS x86 ABI, the type of a member function includes a
- // __thiscall qualifier. This is non-conforming, but we still implement
- // the intent of dr547
-#if defined(_M_IX86) || (defined(__MINGW32__) && !defined(__MINGW64__))
-#define THISCALL __thiscall
-#else
-#define THISCALL
-#endif
-
template<typename T> struct X;
- template<typename T> struct X<THISCALL T() const> {};
+ template<typename T> struct X<T() const> {};
template<typename T, typename C> X<T> f(T C::*) { return X<T>(); }
struct S { void f() const; };
- X<THISCALL void() const> x = f(&S::f);
-
-#undef THISCALL
+ X<void() const> x = f(&S::f);
}
namespace dr548 { // dr548: dup 482
OpenPOWER on IntegriCloud