r204096 - Remove 'REQUIRES: LP64' from these tests and use a more targeted fix.

Richard Smith richard-llvm at metafoo.co.uk
Mon Mar 17 17:30:09 PDT 2014


Author: rsmith
Date: Mon Mar 17 19:30:09 2014
New Revision: 204096

URL: http://llvm.org/viewvc/llvm-project?rev=204096&view=rev
Log:
Remove 'REQUIRES: LP64' from these tests and use a more targeted fix.

Modified:
    cfe/trunk/test/CXX/drs/dr412.cpp
    cfe/trunk/test/CXX/drs/dr4xx.cpp

Modified: cfe/trunk/test/CXX/drs/dr412.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr412.cpp?rev=204096&r1=204095&r2=204096&view=diff
==============================================================================
--- cfe/trunk/test/CXX/drs/dr412.cpp (original)
+++ cfe/trunk/test/CXX/drs/dr412.cpp Mon Mar 17 19:30:09 2014
@@ -6,8 +6,8 @@
 // lwg404: yes
 // lwg2340: yes
 
-// REQUIRES: LP64
-typedef __SIZE_TYPE__ size_t;
+// FIXME: __SIZE_TYPE__ expands to 'long long' on some targets.
+__extension__ typedef __SIZE_TYPE__ size_t;
 namespace std { struct bad_alloc {}; }
 
 inline void* operator new(size_t) BAD_ALLOC; // expected-error {{cannot be declared 'inline'}}

Modified: cfe/trunk/test/CXX/drs/dr4xx.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr4xx.cpp?rev=204096&r1=204095&r2=204096&view=diff
==============================================================================
--- cfe/trunk/test/CXX/drs/dr4xx.cpp (original)
+++ cfe/trunk/test/CXX/drs/dr4xx.cpp Mon Mar 17 19:30:09 2014
@@ -2,6 +2,9 @@
 // RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 // RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors
 
+// FIXME: __SIZE_TYPE__ expands to 'long long' on some targets.
+__extension__ typedef __SIZE_TYPE__ size_t;
+
 namespace dr400 { // dr400: yes
   struct A { int a; struct a {}; }; // expected-note 2{{conflicting}} expected-note {{ambiguous}}
   struct B { int a; struct a {}; }; // expected-note 2{{target}} expected-note {{ambiguous}}
@@ -396,9 +399,7 @@ namespace dr428 { // dr428: yes
 }
 
 namespace dr429 { // dr429: yes c++11
-  // REQUIRES: LP64
   // FIXME: This rule is obviously intended to apply to C++98 as well.
-  typedef __SIZE_TYPE__ size_t;
   struct A {
     static void *operator new(size_t, size_t);
     static void operator delete(void*, size_t);





More information about the cfe-commits mailing list