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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@204096 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CXX/drs/dr412.cpp b/test/CXX/drs/dr412.cpp
index ca794997805edf829fa3ef5c271792e877fa066c..cb33e206a632fb56eb0d84f2b843f0e0cb97ca34 100644 (file)
--- a/test/CXX/drs/dr412.cpp
+++ b/test/CXX/drs/dr412.cpp
@@ -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'}}

diff --git a/test/CXX/drs/dr4xx.cpp b/test/CXX/drs/dr4xx.cpp
index 61dfd18c5f07ef2d2970df9bae88ae78044167eb..a6cfb89b78b8200f59495bc021c7ddf275723f0b 100644 (file)
--- a/test/CXX/drs/dr4xx.cpp
+++ b/test/CXX/drs/dr4xx.cpp
@@ -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);