diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-10-24 23:47:04 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-10-24 23:47:04 +0000 |
| commit | 1265ddef99aec50973caf26146f0eacf4ff5f76c (patch) | |
| tree | 251b25350afc7785fe9a0699ff6edd80aeac4736 /clang/lib/Sema/SemaExprCXX.cpp | |
| parent | 60fddac907a8759b02ff1ff2a60d426c1a0a9a8c (diff) | |
| download | bcm5719-llvm-1265ddef99aec50973caf26146f0eacf4ff5f76c.tar.gz bcm5719-llvm-1265ddef99aec50973caf26146f0eacf4ff5f76c.zip | |
Revert "[SemaCXX] Unconfuse Clang when std::align_val_t is unscoped in C++03"
This reverts commit 6f47cdd51341344c0e32630e19e72c94cd25f34e.
llvm-svn: 345225
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 03ec20601c9..1349b5af6aa 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -1515,9 +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 && ParamTy->isIntegerType(); + HasSizeT = FD->getParamDecl(NumBaseParams)->getType()->isIntegerType(); + HasAlignValT = !HasSizeT; } // In CUDA, determine how much we'd like / dislike to call this. |
