diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -4098,9 +4098,11 @@ return; } - ExprResult Init = InitExpr; - if (!FD->getType()->isDependentType() && !InitExpr->isTypeDependent()) { - Init = ConvertMemberDefaultInitExpression(FD, InitExpr, InitLoc); + ExprResult Init = CorrectDelayedTyposInExpr(InitExpr, /*InitDecl=*/nullptr, + /*RecoverUncorrectedTypos=*/true); + assert(Init.isUsable() && "Init should at least have a RecoveryExpr"); + if (!FD->getType()->isDependentType() && !Init.get()->isTypeDependent()) { + Init = ConvertMemberDefaultInitExpression(FD, Init.get(), InitLoc); // C++11 [class.base.init]p7: // The initialization of each base and member constitutes a // full-expression. @@ -4112,9 +4114,7 @@ } } - InitExpr = Init.get(); - - FD->setInClassInitializer(InitExpr); + FD->setInClassInitializer(Init.get()); } /// Find the direct and/or virtual base specifiers that diff --git a/clang/test/PCH/typo3.cpp b/clang/test/PCH/typo3.cpp new file mode 100644 --- /dev/null +++ b/clang/test/PCH/typo3.cpp @@ -0,0 +1,8 @@ +// RUN: not %clang_cc1 -emit-pch %s -o %t.pch 2>&1 | FileCheck %s + +struct S { + // Make sure TypoExprs in default init exprs are corrected before serializing + // in PCH. + int y = bar; + // CHECK: use of undeclared identifier 'bar' +};