From f7e6f5ed80bfbfa3e030f773f899d4ed09ebc53c Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 18 Mar 2014 00:30:09 +0000 Subject: [PATCH] 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 --- test/CXX/drs/dr412.cpp | 4 ++-- test/CXX/drs/dr4xx.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/CXX/drs/dr412.cpp b/test/CXX/drs/dr412.cpp index ca79499780..cb33e206a6 100644 --- 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 61dfd18c5f..a6cfb89b78 100644 --- 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); -- 2.50.1