diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-06-30 03:30:26 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-06-30 03:30:26 +0000 |
| commit | 149e6031323d6507860909a5cbb449fb2d0e0210 (patch) | |
| tree | ba1e4e8ac969b4a5a753964475e43e227a1b7d31 /clang/lib/CodeGen | |
| parent | 6238c6f09a8795b888ebf90d24adc169ebfa5242 (diff) | |
| download | bcm5719-llvm-149e6031323d6507860909a5cbb449fb2d0e0210.tar.gz bcm5719-llvm-149e6031323d6507860909a5cbb449fb2d0e0210.zip | |
[MS ABI] Workaround corner-case bug in the ABI for operator delete
MSVC only genreates array cookies if the class has a destructor. This
is problematic when having to call T::operator delete[](void *, size_t)
because the second argument's argument is impossible to synthesize
correctly if the class has no destructor (because there will be no array
cookie).
Instead, MSVC passes the size of the class. Do the same, for
compatibility, instead of crashing.
This fixes PR23990.
llvm-svn: 241038
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGExprCXX.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp index f0f706d7b95..c7adccaeeae 100644 --- a/clang/lib/CodeGen/CGExprCXX.cpp +++ b/clang/lib/CodeGen/CGExprCXX.cpp @@ -1548,7 +1548,8 @@ namespace { // The size of an element, multiplied by the number of elements. llvm::Value *Size = llvm::ConstantInt::get(SizeTy, ElementTypeSize.getQuantity()); - Size = CGF.Builder.CreateMul(Size, NumElements); + if (NumElements) + Size = CGF.Builder.CreateMul(Size, NumElements); // Plus the size of the cookie if applicable. if (!CookieSize.isZero()) { |
