r287258 - Fixes for r287241. Use placement new. Apply clang-format.
Malcolm Parsons via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 17 13:00:10 PST 2016
Author: malcolm.parsons
Date: Thu Nov 17 15:00:09 2016
New Revision: 287258
URL: http://llvm.org/viewvc/llvm-project?rev=287258&view=rev
Log:
Fixes for r287241. Use placement new. Apply clang-format.
Modified:
cfe/trunk/lib/Parse/ParseDeclCXX.cpp
cfe/trunk/lib/Sema/DeclSpec.cpp
cfe/trunk/lib/Sema/SemaDeclCXX.cpp
Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=287258&r1=287257&r2=287258&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Thu Nov 17 15:00:09 2016
@@ -2039,7 +2039,8 @@ void Parser::HandleMemberFunctionDeclDel
LateMethod->DefaultArgs.reserve(FTI.NumParams);
for (unsigned ParamIdx = 0; ParamIdx < FTI.NumParams; ++ParamIdx)
LateMethod->DefaultArgs.push_back(LateParsedDefaultArgument(
- FTI.Params[ParamIdx].Param, std::move(FTI.Params[ParamIdx].DefaultArgTokens)));
+ FTI.Params[ParamIdx].Param,
+ std::move(FTI.Params[ParamIdx].DefaultArgTokens)));
}
}
Modified: cfe/trunk/lib/Sema/DeclSpec.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/DeclSpec.cpp?rev=287258&r1=287257&r2=287258&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/DeclSpec.cpp (original)
+++ cfe/trunk/lib/Sema/DeclSpec.cpp Thu Nov 17 15:00:09 2016
@@ -223,15 +223,11 @@ DeclaratorChunk DeclaratorChunk::getFunc
if (!TheDeclarator.InlineStorageUsed &&
NumParams <= llvm::array_lengthof(TheDeclarator.InlineParams)) {
I.Fun.Params = TheDeclarator.InlineParams;
- // Zero the memory block so that unique pointers are initialized
- // properly.
- memset(I.Fun.Params, 0, sizeof(Params[0]) * NumParams);
+ new (I.Fun.Params) ParamInfo[NumParams];
I.Fun.DeleteParams = false;
TheDeclarator.InlineStorageUsed = true;
} else {
- // Call the version of new that zeroes memory so that unique pointers
- // are initialized properly.
- I.Fun.Params = new DeclaratorChunk::ParamInfo[NumParams]();
+ I.Fun.Params = new DeclaratorChunk::ParamInfo[NumParams];
I.Fun.DeleteParams = true;
}
for (unsigned i = 0; i < NumParams; i++)
Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=287258&r1=287257&r2=287258&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Thu Nov 17 15:00:09 2016
@@ -395,7 +395,8 @@ void Sema::CheckExtraCXXDefaultArguments
++argIdx) {
ParmVarDecl *Param = cast<ParmVarDecl>(chunk.Fun.Params[argIdx].Param);
if (Param->hasUnparsedDefaultArg()) {
- std::unique_ptr<CachedTokens> Toks = std::move(chunk.Fun.Params[argIdx].DefaultArgTokens);
+ std::unique_ptr<CachedTokens> Toks =
+ std::move(chunk.Fun.Params[argIdx].DefaultArgTokens);
SourceRange SR;
if (Toks->size() > 1)
SR = SourceRange((*Toks)[1].getLocation(),
More information about the cfe-commits
mailing list