diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-10-25 19:50:43 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-10-25 19:50:43 +0000 |
| commit | 3b4bbe7b0f15ddd57e614922ffdaaf6409a88378 (patch) | |
| tree | 46ed1f1fb11b12e8ee2e1afc85ffc09369a27678 /clang/lib/Sema/SemaExprCXX.cpp | |
| parent | 5aa945e7ac65c3409f4a31859779567afe6da9e4 (diff) | |
| download | bcm5719-llvm-3b4bbe7b0f15ddd57e614922ffdaaf6409a88378.tar.gz bcm5719-llvm-3b4bbe7b0f15ddd57e614922ffdaaf6409a88378.zip | |
Revert "[SemaCXX] Unconfuse Clang when std::align_val_t is unscoped in C++03"
This reverts commit b5d8d0de744d2c212bdb17d5c5fd4447dd14dbd2.
llvm-svn: 345306
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 43e753636d1..1349b5af6aa 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -1515,11 +1515,8 @@ namespace { if (FD->getNumParams() == NumBaseParams + 2) HasAlignValT = HasSizeT = true; else if (FD->getNumParams() == NumBaseParams + 1) { - QualType ParamTy = FD->getParamDecl(NumBaseParams)->getType(); - HasAlignValT = ParamTy->isAlignValT(); - HasSizeT = !HasAlignValT; - assert((HasAlignValT || ParamTy->isIntegerType()) && - "Candidate is not regular dealloc function"); + HasSizeT = FD->getParamDecl(NumBaseParams)->getType()->isIntegerType(); + HasAlignValT = !HasSizeT; } // In CUDA, determine how much we'd like / dislike to call this. |
