Revert "[SemaCXX] Unconfuse Clang when std::align_val_t is unscoped in C++03"
This reverts commit b5d8d0de744d2c212bdb17d5c5fd4447dd14dbd2.
llvm-svn: 345306
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 43e7536..1349b5a 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -1515,11 +1515,8 @@
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.