maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

After consultation with doug, revert r131515. 

llvm-svn: 131574
This commit is contained in:
Alexis Hunt 2011-05-18 20:57:13 +00:00
parent d0cdd1fab1
commit 1647354ec9
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -2997,12 +2997,6 @@ void Sema::CheckCompletedCXXClass(CXXRecordDecl *Record) {
// have inherited constructors.
DeclareInheritedConstructors(Record);
// Unfortunately, in C++0x mode, we additionally have to declare all
// implicit members in order to ensure we don't get a horrible evil bad
// infinite recursion from ShouldDelete*
if (getLangOptions().CPlusPlus0x)
ForceDeclarationOfImplicitMembers(Record);
CheckExplicitlyDefaultedMethods(Record);
}
@ -3459,10 +3453,8 @@ bool Sema::ShouldDeleteDefaultConstructor(CXXConstructorDecl *CD) {
}
bool Sema::ShouldDeleteCopyConstructor(CXXConstructorDecl *CD) {
CXXRecordDecl *RD = CD->getParent()->getDefinition();
CXXRecordDecl *RD = CD->getParent();
assert(!RD->isDependentType() && "do deletion after instantiation");
assert(RD);
assert(CD->getParent() == RD);
if (!LangOpts.CPlusPlus0x)
return false;