summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaExprCXX.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-05-31 20:26:12 +0000
committerAnders Carlsson <andersca@mac.com>2009-05-31 20:26:12 +0000
commit6f9dabff6daf7cb984f40aa067693c0f3ad15459 (patch)
treee830d9419b494f07585128b4b3d62c7aec14d5f2 /clang/lib/Sema/SemaExprCXX.cpp
parent1832f52b10f8b3ec0b497ea5b7f7dd2f581b3a3b (diff)
downloadbcm5719-llvm-6f9dabff6daf7cb984f40aa067693c0f3ad15459.tar.gz
bcm5719-llvm-6f9dabff6daf7cb984f40aa067693c0f3ad15459.zip
Make sure to copy back arguments that can be changed by FindAllocationOverload. This fixes placement new. (Sebastian, please review).
llvm-svn: 72673
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaExprCXX.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index a44dcf6f8bf..65018daff75 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/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);
OpenPOWER on IntegriCloud