summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2009-07-01 23:35:25 +0000
committerFariborz Jahanian <fjahanian@apple.com>2009-07-01 23:35:25 +0000
commit5c6af0a9989f068d8021e7453d5cda65844fdbb6 (patch)
tree2140dc992f97446c3d0da51028e3a1642b5df128 /clang/lib/Sema/SemaDeclCXX.cpp
parent873db258791b2c16ede203276737b3d46d5798bd (diff)
downloadbcm5719-llvm-5c6af0a9989f068d8021e7453d5cda65844fdbb6.tar.gz
bcm5719-llvm-5c6af0a9989f068d8021e7453d5cda65844fdbb6.zip
Use Destroy for member initializer list clean up.
Per Doug's comments. Doug please review. llvm-svn: 74666
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index bbb173a02ad..bef63a16d6c 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -782,7 +782,7 @@ void Sema::ActOnMemInitializers(DeclPtrTy ConstructorDecl,
return;
}
llvm::DenseMap<void*, CXXBaseOrMemberInitializer *>Members;
-
+ bool err = false;
for (unsigned i = 0; i < NumMemInits; i++) {
CXXBaseOrMemberInitializer *Member =
static_cast<CXXBaseOrMemberInitializer*>(MemInits[i]);
@@ -811,7 +811,12 @@ void Sema::ActOnMemInitializers(DeclPtrTy ConstructorDecl,
}
Diag(PrevMember->getSourceLocation(), diag::note_previous_initializer)
<< 0;
+ err = true;
}
+ if (!err)
+ Constructor->setBaseOrMemberInitializers(Context,
+ reinterpret_cast<CXXBaseOrMemberInitializer **>(MemInits),
+ NumMemInits);
}
namespace {
OpenPOWER on IntegriCloud