r296184 - [Test] Make Lit tests C++11 compatible #9
Charles Li via cfe-commits
cfe-commits at lists.llvm.org
Fri Feb 24 14:22:05 PST 2017
Author: lcharles
Date: Fri Feb 24 16:22:05 2017
New Revision: 296184
URL: http://llvm.org/viewvc/llvm-project?rev=296184&view=rev
Log:
[Test] Make Lit tests C++11 compatible #9
[Test] Make Lit tests C++11 compatible #9
Differential Revision: https://reviews.llvm.org/D20710
Modified:
cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp
cfe/trunk/test/CodeGenCXX/dynamic-cast-hint.cpp
cfe/trunk/test/SemaCXX/i-c-e-cxx.cpp
cfe/trunk/test/SemaCXX/new-delete.cpp
cfe/trunk/test/SemaCXX/no-wchar.cpp
cfe/trunk/test/SemaCXX/virtual-member-functions-key-function.cpp
cfe/trunk/test/SemaCXX/warn-bool-conversion.cpp
cfe/trunk/test/SemaCXX/zero-length-arrays.cpp
cfe/trunk/test/SemaTemplate/instantiate-c99.cpp
cfe/trunk/test/SemaTemplate/temp_explicit.cpp
cfe/trunk/test/SemaTemplate/value-dependent-null-pointer-constant.cpp
Modified: cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/debug-info-use-after-free.cpp Fri Feb 24 16:22:05 2017
@@ -1,4 +1,6 @@
// RUN: %clang_cc1 -debug-info-kind=limited -triple %itanium_abi_triple -emit-llvm-only %s
+// RUN: %clang_cc1 -debug-info-kind=limited -triple %itanium_abi_triple -emit-llvm-only -std=c++98 %s
+// RUN: %clang_cc1 -debug-info-kind=limited -triple %itanium_abi_triple -emit-llvm-only -std=c++11 %s
// Check that we don't crash.
// PR12305, PR12315
@@ -233,6 +235,7 @@ template < class > class scoped_ptr {
namespace {
class
AAA {
+protected:
virtual ~
AAA () {
}};
Modified: cfe/trunk/test/CodeGenCXX/dynamic-cast-hint.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/dynamic-cast-hint.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/dynamic-cast-hint.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/dynamic-cast-hint.cpp Fri Feb 24 16:22:05 2017
@@ -1,7 +1,9 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin12 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin12 -emit-llvm -std=c++98 -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin12 -emit-llvm -std=c++11 -o - %s | FileCheck %s
-class A { virtual ~A() {} };
-class B { virtual ~B() {} };
+class A { protected: virtual ~A() {} };
+class B { protected: virtual ~B() {} };
class C : A { char x; };
class D : public A { short y; };
Modified: cfe/trunk/test/SemaCXX/i-c-e-cxx.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/i-c-e-cxx.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/i-c-e-cxx.cpp (original)
+++ cfe/trunk/test/SemaCXX/i-c-e-cxx.cpp Fri Feb 24 16:22:05 2017
@@ -1,4 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -std=gnu++98 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -std=gnu++11 %s
// C++-specific tests for integral constant expressions.
@@ -16,9 +18,21 @@ void f() {
}
int a() {
- const int t=t; // expected-note {{declared here}} expected-note {{read of object outside its lifetime}}
- switch(1) { // expected-warning {{no case matching constant switch condition '1'}}
- case t:; // expected-error {{not an integral constant expression}} expected-note {{initializer of 't' is not a constant expression}}
+ const int t=t; // expected-note {{declared here}}
+#if __cplusplus <= 199711L
+ // expected-note at -2 {{read of object outside its lifetime}}
+#endif
+
+ switch(1) {
+#if __cplusplus <= 199711L
+ // expected-warning at -2 {{no case matching constant switch condition '1'}}
+#endif
+ case t:; // expected-note {{initializer of 't' is not a constant expression}}
+#if __cplusplus <= 199711L
+ // expected-error at -2 {{not an integral constant expression}}
+#else
+ // expected-error at -4 {{case value is not a constant expression}}
+#endif
}
}
@@ -48,7 +62,10 @@ void pr6373(const unsigned x = 0) {
namespace rdar9204520 {
struct A {
- static const int B = int(0.75 * 1000 * 1000); // expected-warning {{not a constant expression; folding it to a constant is a GNU extension}}
+ static const int B = int(0.75 * 1000 * 1000);
+#if __cplusplus <= 199711L
+ // expected-warning at -2 {{not a constant expression; folding it to a constant is a GNU extension}}
+#endif
};
int foo() { return A::B; }
@@ -59,10 +76,24 @@ const int x = 10;
int* y = reinterpret_cast<const char&>(x); // expected-error {{cannot initialize}}
// This isn't an integral constant expression, but make sure it folds anyway.
-struct PR8836 { char _; long long a; }; // expected-warning {{long long}}
-int PR8836test[(__typeof(sizeof(int)))&reinterpret_cast<const volatile char&>((((PR8836*)0)->a))]; // expected-warning {{folded to constant array as an extension}} expected-note {{cast that performs the conversions of a reinterpret_cast is not allowed in a constant expression}}
+struct PR8836 { char _; long long a; };
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{'long long' is a C++11 extension}}
+#endif
+
+int PR8836test[(__typeof(sizeof(int)))&reinterpret_cast<const volatile char&>((((PR8836*)0)->a))];
+// expected-warning at -1 {{folded to constant array as an extension}}
+// expected-note at -2 {{cast that performs the conversions of a reinterpret_cast is not allowed in a constant expression}}
+
+const int nonconst = 1.0;
+#if __cplusplus <= 199711L
+// expected-note at -2 {{declared here}}
+#endif
+int arr[nonconst];
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{folded to constant array as an extension}}
+// expected-note at -3 {{initializer of 'nonconst' is not a constant expression}}
+#endif
-const int nonconst = 1.0; // expected-note {{declared here}}
-int arr[nonconst]; // expected-warning {{folded to constant array as an extension}} expected-note {{initializer of 'nonconst' is not a constant expression}}
const int castfloat = static_cast<int>(1.0);
int arr2[castfloat]; // ok
Modified: cfe/trunk/test/SemaCXX/new-delete.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/new-delete.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/new-delete.cpp (original)
+++ cfe/trunk/test/SemaCXX/new-delete.cpp Fri Feb 24 16:22:05 2017
@@ -1,7 +1,12 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s -triple=i686-pc-linux-gnu -Wno-new-returns-null
+// RUN: %clang_cc1 -fsyntax-only -verify %s -triple=i686-pc-linux-gnu -Wno-new-returns-null -std=c++98
+// RUN: %clang_cc1 -fsyntax-only -verify %s -triple=i686-pc-linux-gnu -Wno-new-returns-null -std=c++11
#include <stddef.h>
+#if __cplusplus >= 201103L
+// expected-note at +2 {{candidate constructor (the implicit move constructor) not viable}}
+#endif
struct S // expected-note {{candidate}}
{
S(int, int, double); // expected-note {{candidate}}
@@ -72,7 +77,13 @@ void bad_news(int *ip)
(void)new; // expected-error {{expected a type}}
(void)new 4; // expected-error {{expected a type}}
(void)new () int; // expected-error {{expected expression}}
- (void)new int[1.1]; // expected-error {{array size expression must have integral or enumeration type, not 'double'}}
+ (void)new int[1.1];
+#if __cplusplus <= 199711L
+ // expected-error at -2 {{array size expression must have integral or enumeration type, not 'double'}}
+#else
+ // expected-error at -4 {{array size expression must have integral or unscoped enumeration type, not 'double'}}
+#endif
+
(void)new int[1][i]; // expected-error {{only the first dimension}} expected-note {{read of non-const variable 'i' is not allowed in a constant expression}}
(void)new (int[1][i]); // expected-error {{only the first dimension}} expected-note {{read of non-const variable 'i' is not allowed in a constant expression}}
(void)new (int[i]); // expected-warning {{when type is in parentheses}}
@@ -85,7 +96,13 @@ void bad_news(int *ip)
// Undefined, but clang should reject it directly.
(void)new int[-1]; // expected-error {{array size is negative}}
(void)new int[2000000000]; // expected-error {{array is too large}}
- (void)new int[*(S*)0]; // expected-error {{array size expression must have integral or enumeration type, not 'S'}}
+ (void)new int[*(S*)0];
+#if __cplusplus <= 199711L
+ // expected-error at -2 {{array size expression must have integral or enumeration type, not 'S'}}
+#else
+ // expected-error at -4 {{array size expression must have integral or unscoped enumeration type, not 'S'}}
+#endif
+
(void)::S::new int; // expected-error {{expected unqualified-id}}
(void)new (0, 0) int; // expected-error {{no matching function for call to 'operator new'}}
(void)new (0L) int; // expected-error {{call to 'operator new' is ambiguous}}
@@ -109,7 +126,12 @@ void good_deletes()
void bad_deletes()
{
delete 0; // expected-error {{cannot delete expression of type 'int'}}
- delete [0] (int*)0; // expected-error {{expected expression}}
+ delete [0] (int*)0;
+#if __cplusplus <= 199711L
+ // expected-error at -2 {{expected expression}}
+#else
+ // expected-error at -4 {{expected variable name or 'this' in lambda capture list}}
+#endif
delete (void*)0; // expected-warning {{cannot delete expression with pointer-to-'void' type 'void *'}}
delete (T*)0; // expected-warning {{deleting pointer to incomplete type}}
::S::delete (int*)0; // expected-error {{expected unqualified-id}}
@@ -209,14 +231,31 @@ void f(X9 *x9) {
struct X10 {
virtual ~X10();
-};
-
-struct X11 : X10 { // expected-error {{no suitable member 'operator delete' in 'X11'}}
- void operator delete(void*, int); // expected-note {{'operator delete' declared here}}
+#if __cplusplus >= 201103L
+ // expected-note at -2 {{overridden virtual function is here}}
+#endif
+};
+
+struct X11 : X10 {
+#if __cplusplus <= 199711L
+// expected-error at -2 {{no suitable member 'operator delete' in 'X11'}}
+#else
+// expected-error at -4 {{deleted function '~X11' cannot override a non-deleted function}}
+// expected-note at -5 2 {{virtual destructor requires an unambiguous, accessible 'operator delete'}}
+#endif
+ void operator delete(void*, int);
+#if __cplusplus <= 199711L
+ // expected-note at -2 {{'operator delete' declared here}}
+#endif
};
void f() {
- X11 x11; // expected-note {{implicit destructor for 'X11' first required here}}
+ X11 x11;
+#if __cplusplus <= 199711L
+ // expected-note at -2 {{implicit destructor for 'X11' first required here}}
+#else
+ // expected-error at -4 {{attempt to use a deleted function}}
+#endif
}
struct X12 {
@@ -398,10 +437,24 @@ namespace PR7702 {
}
namespace ArrayNewNeedsDtor {
- struct A { A(); private: ~A(); }; // expected-note {{declared private here}}
- struct B { B(); A a; }; // expected-error {{field of type 'ArrayNewNeedsDtor::A' has private destructor}}
+ struct A { A(); private: ~A(); };
+#if __cplusplus <= 199711L
+ // expected-note at -2 {{declared private here}}
+#endif
+ struct B { B(); A a; };
+#if __cplusplus <= 199711L
+ // expected-error at -2 {{field of type 'ArrayNewNeedsDtor::A' has private destructor}}
+#else
+ // expected-note at -4 {{destructor of 'B' is implicitly deleted because field 'a' has an inaccessible destructor}}
+#endif
+
B *test9() {
- return new B[5]; // expected-note {{implicit destructor for 'ArrayNewNeedsDtor::B' first required here}}
+ return new B[5];
+#if __cplusplus <= 199711L
+ // expected-note at -2 {{implicit destructor for 'ArrayNewNeedsDtor::B' first required here}}
+#else
+ // expected-error at -4 {{attempt to use a deleted function}}
+#endif
}
}
Modified: cfe/trunk/test/SemaCXX/no-wchar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/no-wchar.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/no-wchar.cpp (original)
+++ cfe/trunk/test/SemaCXX/no-wchar.cpp Fri Feb 24 16:22:05 2017
@@ -1,4 +1,6 @@
// RUN: %clang_cc1 -triple i386-pc-win32 -fsyntax-only -fno-wchar -verify %s
+// RUN: %clang_cc1 -triple i386-pc-win32 -fsyntax-only -fno-wchar -verify -std=c++98 %s
+// RUN: %clang_cc1 -triple i386-pc-win32 -fsyntax-only -fno-wchar -verify -std=c++11 %s
wchar_t x; // expected-error {{unknown type name 'wchar_t'}}
typedef unsigned short wchar_t;
@@ -9,7 +11,11 @@ void bar() {
}
void foo1(wchar_t * t = L"");
-// expected-warning at -1 {{conversion from string literal to 'wchar_t *' (aka 'unsigned short *') is deprecated}}
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{conversion from string literal to 'wchar_t *' (aka 'unsigned short *') is deprecated}}
+#else
+// expected-warning at -4 {{ISO C++11 does not allow conversion from string literal to 'wchar_t *' (aka 'unsigned short *')}}
+#endif
short *a = L"";
// expected-error at -1 {{cannot initialize a variable of type 'short *' with an lvalue of type 'const unsigned short [1]'}}
Modified: cfe/trunk/test/SemaCXX/virtual-member-functions-key-function.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/virtual-member-functions-key-function.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/virtual-member-functions-key-function.cpp (original)
+++ cfe/trunk/test/SemaCXX/virtual-member-functions-key-function.cpp Fri Feb 24 16:22:05 2017
@@ -1,20 +1,51 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
+
struct A {
virtual ~A();
+#if __cplusplus >= 201103L
+// expected-note at -2 2 {{overridden virtual function is here}}
+#endif
};
-struct B : A { // expected-error {{no suitable member 'operator delete' in 'B'}}
- B() { } // expected-note {{implicit destructor for 'B' first required here}}
- void operator delete(void *, int); // expected-note {{'operator delete' declared here}}
+struct B : A {
+#if __cplusplus <= 199711L
+// expected-error at -2 {{no suitable member 'operator delete' in 'B'}}
+#else
+// expected-error at -4 {{deleted function '~B' cannot override a non-deleted function}}
+// expected-note at -5 {{virtual destructor requires an unambiguous, accessible 'operator delete'}}
+#endif
+ B() { }
+#if __cplusplus <= 199711L
+// expected-note at -2 {{implicit destructor for 'B' first required here}}
+#endif
+
+ void operator delete(void *, int);
+#if __cplusplus <= 199711L
+// expected-note at -2 {{'operator delete' declared here}}
+#endif
};
-struct C : A { // expected-error {{no suitable member 'operator delete' in 'C'}}
- void operator delete(void *, int); // expected-note {{'operator delete' declared here}}
+struct C : A {
+#if __cplusplus <= 199711L
+// expected-error at -2 {{no suitable member 'operator delete' in 'C'}}
+#else
+// expected-error at -4 {{deleted function '~C' cannot override a non-deleted function}}
+// expected-note at -5 {{virtual destructor requires an unambiguous, accessible 'operator delete'}}
+#endif
+ void operator delete(void *, int);
+#if __cplusplus <= 199711L
+// expected-note at -2 {{'operator delete' declared here}}
+#endif
};
void f() {
(void)new B;
- (void)new C; // expected-note {{implicit destructor for 'C' first required here}}
+ (void)new C;
+#if __cplusplus <= 199711L
+// expected-note at -2 {{implicit destructor for 'C' first required here}}
+#endif
}
// Make sure that the key-function computation is consistent when the
Modified: cfe/trunk/test/SemaCXX/warn-bool-conversion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-bool-conversion.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-bool-conversion.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-bool-conversion.cpp Fri Feb 24 16:22:05 2017
@@ -1,19 +1,66 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
namespace BooleanFalse {
-int* j = false; // expected-warning{{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+int* j = false;
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+#else
+// expected-error at -4 {{cannot initialize a variable of type 'int *' with an rvalue of type 'bool'}}
+#endif
-void foo(int* i, int *j=(false)) // expected-warning{{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+#if __cplusplus <= 199711L
+// expected-warning at +6 {{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+#else
+// expected-error at +4 {{cannot initialize a parameter of type 'int *' with an rvalue of type 'bool'}}
+// expected-note at +3 {{passing argument to parameter 'j' here}}
+// expected-note at +2 6 {{candidate function not viable: requires 2 arguments, but 1 was provided}}
+#endif
+void foo(int* i, int *j=(false))
{
- foo(false); // expected-warning{{initialization of pointer of type 'int *' to null from a constant boolean expression}}
- foo((int*)false); // no-warning: explicit cast
- foo(0); // no-warning: not a bool, even though its convertible to bool
+ foo(false);
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+#else
+// expected-error at -4 {{no matching function for call to 'foo'}}
+#endif
- foo(false == true); // expected-warning{{initialization of pointer of type 'int *' to null from a constant boolean expression}}
- foo((42 + 24) < 32); // expected-warning{{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+ foo((int*)false);
+#if __cplusplus <= 199711L
+// no-warning: explicit cast
+#else
+// expected-error at -4 {{no matching function for call to 'foo'}}
+#endif
+
+ foo(0);
+#if __cplusplus <= 199711L
+// no-warning: not a bool, even though its convertible to bool
+#else
+// expected-error at -4 {{no matching function for call to 'foo'}}
+#endif
+
+ foo(false == true);
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+#else
+// expected-error at -4 {{no matching function for call to 'foo'}}
+#endif
+
+ foo((42 + 24) < 32);
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+#else
+// expected-error at -4 {{no matching function for call to 'foo'}}
+#endif
const bool kFlag = false;
- foo(kFlag); // expected-warning{{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+ foo(kFlag);
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{initialization of pointer of type 'int *' to null from a constant boolean expression}}
+#else
+// expected-error at -4 {{no matching function for call to 'foo'}}
+#endif
}
char f(struct Undefined*);
Modified: cfe/trunk/test/SemaCXX/zero-length-arrays.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/zero-length-arrays.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/zero-length-arrays.cpp (original)
+++ cfe/trunk/test/SemaCXX/zero-length-arrays.cpp Fri Feb 24 16:22:05 2017
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-// expected-no-diagnostics
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
// <rdar://problem/10228639>
class Foo {
@@ -12,6 +13,9 @@ public:
class Bar {
int foo_count;
Foo foos[0];
+#if __cplusplus >= 201103L
+// expected-note at -2 {{copy constructor of 'Bar' is implicitly deleted because field 'foos' has an inaccessible copy constructor}}
+#endif
Foo foos2[0][2];
Foo foos3[2][0];
@@ -23,5 +27,10 @@ public:
void testBar() {
Bar b;
Bar b2(b);
+#if __cplusplus >= 201103L
+// expected-error at -2 {{call to implicitly-deleted copy constructor of 'Bar}}
+#else
+// expected-no-diagnostics
+#endif
b = b2;
}
Modified: cfe/trunk/test/SemaTemplate/instantiate-c99.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-c99.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-c99.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiate-c99.cpp Fri Feb 24 16:22:05 2017
@@ -1,4 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
// Test template instantiation for C99-specific features.
@@ -9,8 +11,13 @@ template<typename T, typename XType, typ
struct DesigInit0 {
void f(XType x, YType y) {
T agg = {
+#if __cplusplus <= 199711L
.y = y, // expected-error{{does not refer}}
.x = x // expected-error{{does not refer}}
+#else
+ .y = static_cast<float>(y), // expected-error{{does not refer}}
+ .x = static_cast<float>(x) // expected-error{{does not refer}}
+#endif
};
}
};
@@ -44,7 +51,11 @@ template<typename T, int Subscript1, int
struct DesigArrayInit0 {
void f(Val1 val1, Val2 val2) {
T array = {
+#if __cplusplus <= 199711L
[Subscript1] = val1,
+#else
+ [Subscript1] = static_cast<int>(val1),
+#endif
[Subscript2] = val2 // expected-error{{exceeds array bounds}}
};
@@ -60,7 +71,11 @@ template<typename T, int Subscript1, int
struct DesigArrayRangeInit0 {
void f(Val1 val1) {
T array = {
+#if __cplusplus <= 199711L
[Subscript1...Subscript2] = val1 // expected-error{{exceeds}}
+#else
+ [Subscript1...Subscript2] = static_cast<int>(val1) // expected-error{{exceeds}}
+#endif
};
}
};
@@ -74,7 +89,11 @@ template struct DesigArrayRangeInit0<int
template<typename T, typename Arg1, typename Arg2>
struct CompoundLiteral0 {
T f(Arg1 a1, Arg2 a2) {
+#if __cplusplus <= 199711L
return (T){a1, a2};
+#else
+ return (T){static_cast<float>(a1), a2};
+#endif
}
};
Modified: cfe/trunk/test/SemaTemplate/temp_explicit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/temp_explicit.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/temp_explicit.cpp (original)
+++ cfe/trunk/test/SemaTemplate/temp_explicit.cpp Fri Feb 24 16:22:05 2017
@@ -1,4 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -Wc++11-compat %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -Wc++11-compat -std=c++98 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -std=c++11 %s
//
// Tests explicit instantiation of templates.
template<typename T, typename U = T> class X0 { };
@@ -98,7 +100,12 @@ void f4(X5<float&>::Inner2);
template struct X5<float&>::Inner2; // expected-note{{instantiation}}
namespace N3 {
- template struct N2::X5<int>::Inner2; // expected-warning {{explicit instantiation of 'Inner2' not in a namespace enclosing 'N2'}}
+ template struct N2::X5<int>::Inner2;
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{explicit instantiation of 'Inner2' not in a namespace enclosing 'N2'}}
+#else
+// expected-error at -4 {{explicit instantiation of 'Inner2' not in a namespace enclosing 'N2'}}
+#endif
}
struct X6 {
@@ -145,7 +152,17 @@ template struct ::N1::Inner::X8<float>;
namespace N2 {
using namespace N1;
- template struct X7<double>; // expected-warning{{must occur in namespace}}
-
- template struct X9<float>; // expected-warning{{must occur at global scope}}
+ template struct X7<double>;
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{explicit instantiation of 'N1::X7' must occur in namespace 'N1'}}
+#else
+// expected-error at -4 {{explicit instantiation of 'N1::X7' must occur in namespace 'N1'}}
+#endif
+
+ template struct X9<float>;
+#if __cplusplus <= 199711L
+// expected-warning at -2 {{explicit instantiation of 'X9' must occur at global scope}}
+#else
+// expected-error at -4 {{explicit instantiation of 'X9' must occur at global scope}}
+#endif
}
Modified: cfe/trunk/test/SemaTemplate/value-dependent-null-pointer-constant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/value-dependent-null-pointer-constant.cpp?rev=296184&r1=296183&r2=296184&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/value-dependent-null-pointer-constant.cpp (original)
+++ cfe/trunk/test/SemaTemplate/value-dependent-null-pointer-constant.cpp Fri Feb 24 16:22:05 2017
@@ -1,17 +1,30 @@
-// RUN: %clang_cc1 -fsyntax-only %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
template<typename T, int N>
struct X0 {
const char *f0(bool Cond) {
return Cond? "honk" : N;
+#if __cplusplus >= 201103L
+// expected-error at -2 {{incompatible operand types ('const char *' and 'int')}}
+#else
+// expected-no-diagnostics
+#endif
}
const char *f1(bool Cond) {
return Cond? N : "honk";
+#if __cplusplus >= 201103L
+// expected-error at -2 {{incompatible operand types ('int' and 'const char *')}}
+#endif
}
bool f2(const char *str) {
return str == N;
+#if __cplusplus >= 201103L
+// expected-error at -2 {{comparison between pointer and integer ('const char *' and 'int')}}
+#endif
}
};
More information about the cfe-commits
mailing list