Author: Adam Czachorowski Date: 2021-06-10T16:54:15+02:00 New Revision: 49eba8bf1780684f1173a455b909ce37008eaa09
URL: https://github.com/llvm/llvm-project/commit/49eba8bf1780684f1173a455b909ce37008eaa09 DIFF: https://github.com/llvm/llvm-project/commit/49eba8bf1780684f1173a455b909ce37008eaa09.diff LOG: [clang] Do not crash when ArgTy is null in CheckArgAlignment This can happen around RecoveryExpr. Differential Revision: https://reviews.llvm.org/D103825 Added: Modified: clang/lib/Sema/SemaChecking.cpp clang/test/SemaCXX/recovery-expr-type.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 99110c6b5d8dd..86c888548077e 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -4571,8 +4571,9 @@ void Sema::CheckArgAlignment(SourceLocation Loc, NamedDecl *FDecl, // Find expected alignment, and the actual alignment of the passed object. // getTypeAlignInChars requires complete types - if (ParamTy->isIncompleteType() || ArgTy->isIncompleteType() || - ParamTy->isUndeducedType() || ArgTy->isUndeducedType()) + if (ArgTy.isNull() || ParamTy->isIncompleteType() || + ArgTy->isIncompleteType() || ParamTy->isUndeducedType() || + ArgTy->isUndeducedType()) return; CharUnits ParamAlign = Context.getTypeAlignInChars(ParamTy); @@ -4654,6 +4655,9 @@ void Sema::checkCall(NamedDecl *FDecl, const FunctionProtoType *Proto, for (unsigned ArgIdx = 0; ArgIdx < N; ++ArgIdx) { // Args[ArgIdx] can be null in malformed code. if (const Expr *Arg = Args[ArgIdx]) { + if (Arg->containsErrors()) + continue; + QualType ParamTy = Proto->getParamType(ArgIdx); QualType ArgTy = Arg->getType(); CheckArgAlignment(Arg->getExprLoc(), FDecl, std::to_string(ArgIdx + 1), diff --git a/clang/test/SemaCXX/recovery-expr-type.cpp b/clang/test/SemaCXX/recovery-expr-type.cpp index 8bdf83e9512fd..d3ac772db0089 100644 --- a/clang/test/SemaCXX/recovery-expr-type.cpp +++ b/clang/test/SemaCXX/recovery-expr-type.cpp @@ -136,3 +136,9 @@ void baz() { bar(S(123)); // expected-error {{no matching conversion}} } } // namespace test11 + +namespace test12 { +// Verify we do not crash. +void fun(int *foo = no_such_function()); // expected-error {{undeclared identifier}} +void baz() { fun(); } +} // namespace test12 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
