diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -492,6 +492,9 @@ (`See patch `_). - Fix crash when passing a value larger then 64 bits to the aligned attribute. (`#50534 `_). +- CallExpr built for C error-recovery now is always type-dependent. Fixes a + crash when we encounter a unresolved TypoExpr during diagnostic emission. + (`#50244 _`). Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -7225,13 +7225,8 @@ llvm::any_of(ArgExprs, [](clang::Expr *E) { return E->containsErrors(); })) && "should only occur in error-recovery path."); - QualType ReturnType = - llvm::isa_and_nonnull(NDecl) - ? cast(NDecl)->getCallResultType() - : Context.DependentTy; - return CallExpr::Create(Context, Fn, ArgExprs, ReturnType, - Expr::getValueKindForType(ReturnType), RParenLoc, - CurFPFeatureOverrides()); + return CallExpr::Create(Context, Fn, ArgExprs, Context.DependentTy, + VK_PRValue, RParenLoc, CurFPFeatureOverrides()); } return BuildResolvedCallExpr(Fn, NDecl, LParenLoc, ArgExprs, RParenLoc, ExecConfig, IsExecConfig); diff --git a/clang/test/AST/ast-dump-recovery.c b/clang/test/AST/ast-dump-recovery.c --- a/clang/test/AST/ast-dump-recovery.c +++ b/clang/test/AST/ast-dump-recovery.c @@ -93,7 +93,7 @@ (*__builtin_classify_type)(1); extern void ext(); - // CHECK: CallExpr {{.*}} 'void' contains-errors + // CHECK: CallExpr {{.*}} '' contains-errors // CHECK-NEXT: |-DeclRefExpr {{.*}} 'ext' // CHECK-NEXT: `-RecoveryExpr {{.*}} '' ext(undef_var); @@ -117,3 +117,12 @@ // CHECK-NEXT: | `-RecoveryExpr {{.*}} '' contains-errors if (__builtin_va_arg(undef, int) << 1); } + +void test6_GH50244() { + double array[16]; + // CHECK: UnaryExprOrTypeTraitExpr {{.*}} 'unsigned long' contains-errors sizeof + // CHECK-NEXT: `-CallExpr {{.*}} '' contains-errors + // CHECK-NEXT: |-DeclRefExpr {{.*}} 'int ()' + // CHECK-NEXT: `-RecoveryExpr {{.*}} '' + sizeof array / sizeof foo(undef); +}