Use Destroy for member initializer list clean up.
Per Doug's comments. Doug please review.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74666 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index bbb173a..bef63a1 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -782,7 +782,7 @@
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 @@
}
Diag(PrevMember->getSourceLocation(), diag::note_previous_initializer)
<< 0;
+ err = true;
}
+ if (!err)
+ Constructor->setBaseOrMemberInitializers(Context,
+ reinterpret_cast<CXXBaseOrMemberInitializer **>(MemInits),
+ NumMemInits);
}
namespace {