Skip to content

Commit 3cfa54d

Browse files
committed
Fixes for external
1 parent ea8c92c commit 3cfa54d

File tree

38 files changed

+401
-1209
lines changed

38 files changed

+401
-1209
lines changed

external/llvm-project/clang/lib/AST/Type.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4011,31 +4011,6 @@ StringRef CountAttributedType::getAttributeName(bool WithMacroPrefix) const {
40114011
#undef ENUMERATE_ATTRS
40124012
}
40134013

4014-
StringRef CountAttributedType::getAttributeName(bool WithMacroPrefix) const {
4015-
// TODO: This method isn't really ideal because it doesn't return the spelling
4016-
// of the attribute that was used in the user's code. This method is used for
4017-
// diagnostics so the fact it doesn't use the spelling of the attribute in
4018-
// the user's code could be confusing (#113585).
4019-
#define ENUMERATE_ATTRS(PREFIX) \
4020-
do { \
4021-
if (isCountInBytes()) { \
4022-
if (isOrNull()) \
4023-
return PREFIX "sized_by_or_null"; \
4024-
return PREFIX "sized_by"; \
4025-
} \
4026-
if (isOrNull()) \
4027-
return PREFIX "counted_by_or_null"; \
4028-
return PREFIX "counted_by"; \
4029-
} while (0)
4030-
4031-
if (WithMacroPrefix)
4032-
ENUMERATE_ATTRS("__");
4033-
else
4034-
ENUMERATE_ATTRS("");
4035-
4036-
#undef ENUMERATE_ATTRS
4037-
}
4038-
40394014
TypedefType::TypedefType(TypeClass tc, const TypedefNameDecl *D,
40404015
QualType UnderlyingType, bool HasTypeDifferentFromDecl)
40414016
: Type(tc, UnderlyingType.getCanonicalType(),

external/llvm-project/flang/test/Semantics/OpenMP/allocate02.f90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ subroutine allocate()
1616
!ERROR: At most one ALLOCATOR clause can appear on the ALLOCATE directive
1717
!$omp allocate(x, y) allocator(omp_default_mem_alloc) allocator(omp_default_mem_alloc)
1818

19-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
2019
!$omp allocate(darray) allocator(omp_default_mem_alloc)
2120
allocate ( darray(a, b) )
2221

23-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
2422
!ERROR: At most one ALLOCATOR clause can appear on the ALLOCATE directive
2523
!$omp allocate(darray) allocator(omp_default_mem_alloc) allocator(omp_default_mem_alloc)
2624
allocate ( darray(a, b) )

external/llvm-project/flang/test/Semantics/OpenMP/allocate03.f90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ subroutine allocate()
1818
!ERROR: A variable that is part of another variable (as an array or structure element) cannot appear on the ALLOCATE directive
1919
!$omp allocate(my_var%array)
2020

21-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
2221
!ERROR: A variable that is part of another variable (as an array or structure element) cannot appear on the ALLOCATE directive
2322
!$omp allocate(darray, my_var%array) allocator(omp_default_mem_alloc)
2423
allocate ( darray(a, b) )

external/llvm-project/flang/test/Semantics/OpenMP/allocate05.f90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ subroutine allocate()
1313
real, dimension (:,:), allocatable :: darray
1414

1515
!$omp target
16-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
1716
!$omp allocate allocator(omp_default_mem_alloc)
1817
allocate ( darray(a, b) )
1918
!$omp end target
2019

2120
!$omp target
22-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
2321
!ERROR: ALLOCATE directives that appear in a TARGET region must specify an allocator clause
2422
!$omp allocate
2523
allocate ( darray(a, b) )

external/llvm-project/flang/test/Semantics/OpenMP/allocate06.f90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ subroutine allocate()
1414
!ERROR: List items specified in the ALLOCATE directive must not have the ALLOCATABLE attribute unless the directive is associated with an ALLOCATE statement
1515
!$omp allocate(darray) allocator(omp_default_mem_alloc)
1616

17-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
1817
!$omp allocate(darray) allocator(omp_default_mem_alloc)
1918
allocate(darray(a, b))
2019

external/llvm-project/flang/test/Semantics/OpenMP/allocate09.f90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,23 @@ subroutine allocate()
1212
integer, dimension(:), allocatable :: a, b, c, d, e, f, &
1313
g, h, i, j, k, l
1414

15-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
1615
!$omp allocate(a) allocator(omp_default_mem_alloc)
1716
allocate(a(1), b(2))
1817

19-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
2018
!$omp allocate(c, d) allocator(omp_default_mem_alloc)
2119
allocate(c(3), d(4))
2220

2321
!$omp allocate(e) allocator(omp_default_mem_alloc)
2422
!$omp allocate(f, g) allocator(omp_default_mem_alloc)
25-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
2623
!$omp allocate
2724
allocate(e(5), f(6), g(7))
2825

29-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
3026
!ERROR: Object 'i' in ALLOCATE directive not found in corresponding ALLOCATE statement
3127
!$omp allocate(h, i) allocator(omp_default_mem_alloc)
3228
allocate(h(8))
3329

3430
!ERROR: Object 'j' in ALLOCATE directive not found in corresponding ALLOCATE statement
3531
!$omp allocate(j, k) allocator(omp_default_mem_alloc)
36-
!WARNING: OpenMP directive ALLOCATE has been deprecated, please use ALLOCATORS instead.
3732
!$omp allocate(l) allocator(omp_default_mem_alloc)
3833
allocate(k(9), l(10))
3934

external/llvm-project/libc/test/src/stdlib/StrtolTest.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "src/__support/CPP/limits.h"
1010
#include "src/__support/CPP/type_traits.h"
1111
#include "src/__support/ctype_utils.h"
12-
#include "src/__support/libc_errno.h"
1312
#include "src/__support/macros/properties/architectures.h"
1413
#include "test/UnitTest/ErrnoCheckingTest.h"
1514
#include "test/UnitTest/Test.h"

external/llvm-project/libc/test/src/stdlib/strtold_test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/__support/FPUtil/FPBits.h"
10-
#include "src/__support/libc_errno.h"
1110
#include "src/__support/uint128.h"
1211
#include "src/stdlib/strtold.h"
1312

external/llvm-project/libcxx/test/std/containers/container.adaptors/flat_helpers.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ struct SillyReserveVector : std::vector<T> {
3333
void reserve(size_t) { this->clear(); }
3434
};
3535

36-
template <class T>
37-
struct SillyReserveVector : std::vector<T> {
38-
using std::vector<T>::vector;
39-
40-
void reserve(size_t) { this->clear(); }
41-
};
42-
4336
template <class T, bool ConvertibleToT = false>
4437
struct Transparent {
4538
T t;

external/llvm-project/libcxx/test/support/min_allocator.h

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -420,27 +420,6 @@ class complete_type_allocator {
420420
TEST_CONSTEXPR_CXX20 friend bool operator!=(complete_type_allocator, complete_type_allocator) { return false; }
421421
};
422422

423-
template <class T>
424-
class complete_type_allocator {
425-
public:
426-
using value_type = T;
427-
428-
// Make sure that value_type is a complete when min_allocator is instantiated
429-
static_assert(TEST_ALIGNOF(value_type) != 0, "");
430-
431-
TEST_CONSTEXPR_CXX20 complete_type_allocator() TEST_NOEXCEPT {}
432-
433-
template <class U>
434-
TEST_CONSTEXPR_CXX20 explicit complete_type_allocator(complete_type_allocator<U>) TEST_NOEXCEPT {}
435-
436-
TEST_CONSTEXPR_CXX20 T* allocate(std::size_t n) { return static_cast<T*>(std::allocator<T>().allocate(n)); }
437-
438-
TEST_CONSTEXPR_CXX20 void deallocate(T* p, std::size_t n) { std::allocator<T>().deallocate(p, n); }
439-
440-
TEST_CONSTEXPR_CXX20 friend bool operator==(complete_type_allocator, complete_type_allocator) { return true; }
441-
TEST_CONSTEXPR_CXX20 friend bool operator!=(complete_type_allocator, complete_type_allocator) { return false; }
442-
};
443-
444423
template <class T>
445424
class explicit_allocator
446425
{

0 commit comments

Comments
 (0)