Skip to content

Commit

Permalink
[clang][NFC] Adjust expected directives in DR tests
Browse files Browse the repository at this point in the history
This is a follow-up to 0c06e87, which accomodated expected directives for 32-bit ARM and Windows platforms.

Addressed bot failures:
https://lab.llvm.org/buildbot/#/builders/123/builds/23355
https://lab.llvm.org/buildbot/#/builders/245/builds/17458
  • Loading branch information
Endilll committed Dec 2, 2023
1 parent b04b897 commit 96070e1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion clang/test/CXX/drs/dr2xx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
// RUN: %clang_cc1 -std=c++20 %s -verify=expected,since-cxx11,since-cxx14,since-cxx17 -fexceptions -fcxx-exceptions -pedantic-errors
// RUN: %clang_cc1 -std=c++23 %s -verify=expected,since-cxx11,since-cxx14,since-cxx17 -fexceptions -fcxx-exceptions -pedantic-errors

// FIXME: diagnostic above is emitted only on Windows platforms
// PR13819 -- __SIZE_TYPE__ is incompatible.
typedef __SIZE_TYPE__ size_t;
// cxx98-error@-1 0-1 {{'long long' is a C++11 extension}}

#if __cplusplus < 201103L
#define fold(x) (__builtin_constant_p(x) ? (x) : (x))
Expand Down Expand Up @@ -1296,7 +1298,7 @@ namespace dr299 { // dr299: 2.8 c++11
// cxx98-11-error@#dr299-q {{ambiguous conversion of array size expression of type 'T' to an integral or enumeration type}}
// cxx98-11-note@#dr299-int {{conversion to integral type 'int' declared here}}
// cxx98-11-note@#dr299-ushort {{conversion to integral type 'unsigned short' declared here}}
// since-cxx14-error@#dr299-q {{conversion from 'T' to 'unsigned long' is ambiguous}}
// since-cxx14-error-re@#dr299-q {{{{conversion from 'T' to 'unsigned (long|int)' is ambiguous}}}}
// since-cxx14-note@#dr299-int {{candidate function}}
// since-cxx14-note@#dr299-ushort {{candidate function}}
}

0 comments on commit 96070e1

Please sign in to comment.