[llvm-branch-commits] [cfe-branch] r127614 - in /cfe/branches/release_29: ./ include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/SemaDeclCXX.cpp test/CXX/special/class.inhctor/elsewhere.cpp test/CXX/special/class.inhctor/p3.cpp test/CXX/special/class.inhctor/p7.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Mar 14 15:25:25 2011
New Revision: 127614

URL: http://llvm.org/viewvc/llvm-project?rev=127614&view=rev
Log:
--- Merging r127541 into '.':
U    test/CXX/special/class.inhctor/p3.cpp
U    test/CXX/special/class.inhctor/elsewhere.cpp
U    test/CXX/special/class.inhctor/p7.cpp
U    include/clang/Basic/DiagnosticSemaKinds.td
U    lib/Sema/SemaDeclCXX.cpp


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp
    cfe/branches/release_29/test/CXX/special/class.inhctor/elsewhere.cpp
    cfe/branches/release_29/test/CXX/special/class.inhctor/p3.cpp
    cfe/branches/release_29/test/CXX/special/class.inhctor/p7.cpp
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 15:25:25 2011
@@ -1,2 +1,2 @@
-/cfe/trunk:127460,127563
+/cfe/trunk:127460,127541,127563
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_29/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/include/clang/Basic/DiagnosticSemaKinds.td?rev=127614&r1=127613&r2=127614&view=diff
==============================================================================
--- cfe/branches/release_29/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/branches/release_29/include/clang/Basic/DiagnosticSemaKinds.td Mon Mar 14 15:25:25 2011
@@ -162,6 +162,8 @@
   "using declaration refers to its own class">;
 def err_using_decl_nested_name_specifier_is_not_base_class : Error<
   "using declaration refers into '%0', which is not a base class of %1">;
+def err_using_decl_inherited_constructor_unsupported : Error<
+  "inherited constructors are not supported">;
 def err_using_decl_constructor_not_in_direct_base : Error<
   "%0 is not a direct base of %1, can not inherit constructors">;
 def err_using_decl_constructor_conflict : Error<

Modified: cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp?rev=127614&r1=127613&r2=127614&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/branches/release_29/lib/Sema/SemaDeclCXX.cpp Mon Mar 14 15:25:25 2011
@@ -2850,7 +2850,8 @@
   //   waste space and performance on classes that are not meant to be
   //   instantiated (e.g. meta-functions). This doesn't apply to classes that
   //   have inherited constructors.
-  DeclareInheritedConstructors(Record);
+  // Disabled for 2.9
+  //DeclareInheritedConstructors(Record);
 }
 
 /// \brief Data used with FindHiddenVirtualMethod
@@ -4226,8 +4227,11 @@
 
   // Constructor inheriting using decls get special treatment.
   if (NameInfo.getName().getNameKind() == DeclarationName::CXXConstructorName) {
-    if (CheckInheritedConstructorUsingDecl(UD))
-      UD->setInvalidDecl();
+    // Disabled for 2.9
+    Diag(UD->getLocation(),
+         diag::err_using_decl_inherited_constructor_unsupported);
+    //if (CheckInheritedConstructorUsingDecl(UD))
+    UD->setInvalidDecl();
     return UD;
   }
 

Modified: cfe/branches/release_29/test/CXX/special/class.inhctor/elsewhere.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/test/CXX/special/class.inhctor/elsewhere.cpp?rev=127614&r1=127613&r2=127614&view=diff
==============================================================================
--- cfe/branches/release_29/test/CXX/special/class.inhctor/elsewhere.cpp (original)
+++ cfe/branches/release_29/test/CXX/special/class.inhctor/elsewhere.cpp Mon Mar 14 15:25:25 2011
@@ -1,4 +1,6 @@
-// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s
+// RUN: true
+// Disabled for 2.9
+//%clang_cc1 -std=c++0x -fsyntax-only -verify %s
 
 // Tests related to constructor inheriting, but not specified in [class.inhctor]
 

Modified: cfe/branches/release_29/test/CXX/special/class.inhctor/p3.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/test/CXX/special/class.inhctor/p3.cpp?rev=127614&r1=127613&r2=127614&view=diff
==============================================================================
--- cfe/branches/release_29/test/CXX/special/class.inhctor/p3.cpp (original)
+++ cfe/branches/release_29/test/CXX/special/class.inhctor/p3.cpp Mon Mar 14 15:25:25 2011
@@ -1,4 +1,6 @@
-// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s
+// RUN: true
+// Disabled for 2.9
+//%clang_cc1 -std=c++0x -fsyntax-only -verify %s
 
 struct B1 {
   B1(int);

Modified: cfe/branches/release_29/test/CXX/special/class.inhctor/p7.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/test/CXX/special/class.inhctor/p7.cpp?rev=127614&r1=127613&r2=127614&view=diff
==============================================================================
--- cfe/branches/release_29/test/CXX/special/class.inhctor/p7.cpp (original)
+++ cfe/branches/release_29/test/CXX/special/class.inhctor/p7.cpp Mon Mar 14 15:25:25 2011
@@ -1,4 +1,6 @@
-// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s
+// RUN: true
+// Disabled for 2.9
+//%clang_cc1 -std=c++0x -fsyntax-only -verify %s
 
 // Straight from the standard
 struct B1 {

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 15:25:25 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127460,127563
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127460,127541,127563