r217234 - clang/test/CXX/drs/dr5xx.cpp: Fix up assumption of thiscall. It affects not x64 but x86.

NAKAMURA Takumi geek4civic at gmail.com
Fri Sep 5 01:18:53 PDT 2014


Author: chapuni
Date: Fri Sep  5 03:18:53 2014
New Revision: 217234

URL: http://llvm.org/viewvc/llvm-project?rev=217234&view=rev
Log:
clang/test/CXX/drs/dr5xx.cpp: Fix up assumption of thiscall. It affects not x64 but x86.

Note, i686-cygwin doesn't use thiscall.

Modified:
    cfe/trunk/test/CXX/drs/dr5xx.cpp

Modified: cfe/trunk/test/CXX/drs/dr5xx.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr5xx.cpp?rev=217234&r1=217233&r2=217234&view=diff
==============================================================================
--- cfe/trunk/test/CXX/drs/dr5xx.cpp (original)
+++ cfe/trunk/test/CXX/drs/dr5xx.cpp Fri Sep  5 03:18:53 2014
@@ -518,10 +518,10 @@ namespace dr546 { // dr546: yes
 }
 
 namespace dr547 { // dr547: yes
-  // When targeting the MS ABI, the type of a member function includes a
+  // 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__)
+#if defined(_M_IX86) || (defined(__MINGW32__) && !defined(__MINGW64__))
 #define THISCALL __thiscall
 #else
 #define THISCALL





More information about the cfe-commits mailing list