From 2cfda26abb2e31a0c8963f46fec8ff99e0c5b828 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 27 Apr 2012 20:15:25 +0000 Subject: Merging r155728: ------------------------------------------------------------------------ r155728 | rsmith | 2012-04-27 12:33:05 -0700 (Fri, 27 Apr 2012) | 4 lines PR12224 (sort of): Diagnose inheriting constructor declarations in C++11 mode. We do not support IRGen for these, and get some parts of the semantic analysis wrong. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_31@155731 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CXX/special/class.inhctor/elsewhere.cpp | 16 ++++++++-------- test/CXX/special/class.inhctor/p3.cpp | 12 ++++++------ test/CXX/special/class.inhctor/p7.cpp | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'test/CXX/special') diff --git a/test/CXX/special/class.inhctor/elsewhere.cpp b/test/CXX/special/class.inhctor/elsewhere.cpp index 66afa17309..09fd3d50dc 100644 --- a/test/CXX/special/class.inhctor/elsewhere.cpp +++ b/test/CXX/special/class.inhctor/elsewhere.cpp @@ -9,15 +9,15 @@ struct B1 { B1(int); }; -using B1::B1; // expected-error {{using declaration can not refer to class member}} +using B1::B1; // expected-error {{using declaration can not refer to class member}} expected-error {{not supported}} // C++0x [namespace.udecl]p10: // A using-declaration is a declaration and can therefore be used repeatedly // where (and only where) multiple declarations are allowed. struct I1 : B1 { - using B1::B1; // expected-note {{previous using declaration}} - using B1::B1; // expected-error {{redeclaration of using decl}} + using B1::B1; // expected-note {{previous using declaration}} expected-error {{not supported}} + using B1::B1; // expected-error {{redeclaration of using decl}} expected-error {{not supported}} }; // C++0x [namespace.udecl]p3: @@ -27,31 +27,31 @@ struct I1 : B1 { // shall name a direct base class of the class being defined. struct D1 : I1 { - using B1::B1; // expected-error {{'B1' is not a direct base of 'D1', can not inherit constructors}} + using B1::B1; // expected-error {{'B1' is not a direct base of 'D1', can not inherit constructors}} expected-error {{not supported}} }; template struct A {}; template struct B : A, A { - using A::A; // expected-error {{'A::', which is not a base class of 'B'}} + using A::A; // expected-error {{'A::', which is not a base class of 'B'}} expected-error {{not supported}} }; B bb; B bc; B bd; // expected-note {{here}} template struct C : A { - using A::A; // expected-error {{'A::', which is not a base class of 'C'}} + using A::A; // expected-error {{'A::', which is not a base class of 'C'}} expected-error {{not supported}} }; C cb; C cc; // expected-note {{here}} template struct D : A {}; template struct E : D { - using A::A; // expected-error {{'A' is not a direct base of 'E', can not inherit}} + using A::A; // expected-error {{'A' is not a direct base of 'E', can not inherit}} expected-error {{not supported}} }; E eb; // expected-note {{here}} template struct F : D { - using A::A; // expected-error {{'A' is not a direct base of 'F'}} + using A::A; // expected-error {{'A' is not a direct base of 'F'}} expected-error {{not supported}} }; F fb; // expected-note {{here}} diff --git a/test/CXX/special/class.inhctor/p3.cpp b/test/CXX/special/class.inhctor/p3.cpp index f71ab16c0f..d7093fb369 100644 --- a/test/CXX/special/class.inhctor/p3.cpp +++ b/test/CXX/special/class.inhctor/p3.cpp @@ -5,7 +5,7 @@ struct B1 { B1(int, int); }; struct D1 : B1 { - using B1::B1; + using B1::B1; // expected-error {{not supported}} }; D1 d1a(1), d1b(1, 1); @@ -15,7 +15,7 @@ struct B2 { explicit B2(int, int = 0, int = 0); }; struct D2 : B2 { // expected-note 2 {{candidate constructor}} - using B2::B2; + using B2::B2; // expected-error {{not supported}} }; D2 d2a(1), d2b(1, 1), d2c(1, 1, 1); @@ -25,18 +25,18 @@ struct B3 { B3(void*); // expected-note {{inherited from here}} }; struct D3 : B3 { // expected-note 2 {{candidate constructor}} - using B3::B3; // expected-note {{candidate constructor (inherited)}} + using B3::B3; // expected-note {{candidate constructor (inherited)}} expected-error {{not supported}} }; D3 fd3() { return 1; } // expected-error {{no viable conversion}} template struct T1 : B1 { - using B1::B1; + using B1::B1; // expected-error {{not supported}} }; template struct T2 : T1 { - using T1::T1; + using T1::T1; // expected-error {{not supported}} }; template struct T3 : T1 { - using T1::T1; + using T1::T1; // expected-error {{not supported}} }; struct U { friend T1::T1(int); diff --git a/test/CXX/special/class.inhctor/p7.cpp b/test/CXX/special/class.inhctor/p7.cpp index 9ae160f054..bfaa3ac359 100644 --- a/test/CXX/special/class.inhctor/p7.cpp +++ b/test/CXX/special/class.inhctor/p7.cpp @@ -8,12 +8,12 @@ struct B2 { B2(int); // expected-note {{conflicting constructor}} }; struct D1 : B1, B2 { - using B1::B1; // expected-note {{inherited here}} - using B2::B2; // expected-error {{already inherited constructor with the same signature}} + using B1::B1; // expected-note {{inherited here}} expected-error {{not supported}} + using B2::B2; // expected-error {{already inherited constructor with the same signature}} expected-error {{not supported}} }; struct D2 : B1, B2 { - using B1::B1; - using B2::B2; + using B1::B1; // expected-error {{not supported}} + using B2::B2; // expected-error {{not supported}} D2(int); }; @@ -22,8 +22,8 @@ template struct B3 { }; template struct B4 : B3, B1 { B4(); - using B3::B3; // expected-note {{inherited here}} - using B1::B1; // expected-error {{already inherited}} + using B3::B3; // expected-note {{inherited here}} expected-error {{not supported}} + using B1::B1; // expected-error {{already inherited}} expected-error {{not supported}} }; B4 b4c; B4 b4i; // expected-note {{here}} -- cgit v1.2.3