diff options
author | Anders Carlsson <andersca@mac.com> | 2009-05-31 20:26:12 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2009-05-31 20:26:12 +0000 |
commit | d958389d52170be1c6dee93031d34b13809b786b (patch) | |
tree | 33b2dbdd693f71fb8e2ae1b1017ea325d27ef4e2 /lib/Sema/SemaExprCXX.cpp | |
parent | ed4e367f8e27d2c700efdaff9412f2bf83ddba00 (diff) |
Make sure to copy back arguments that can be changed by FindAllocationOverload. This fixes placement new. (Sebastian, please review).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72673 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaExprCXX.cpp')
-rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index a44dcf6f8b..65018daff7 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -508,6 +508,11 @@ bool Sema::FindAllocationFunctions(SourceLocation StartLoc, SourceRange Range, return true; } + // FindAllocationOverload can change the passed in arguments, so we need to + // copy them back. + if (NumPlaceArgs > 0) + std::copy(&AllocArgs[1], AllocArgs.end(), PlaceArgs); + // FIXME: This is leaked on error. But so much is currently in Sema that it's // easier to clean it in one go. AllocArgs[0]->Destroy(Context); |