llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Aaron Ballman (AaronBallman) <details> <summary>Changes</summary> This removes the delayed typo correction functionality from Clang (regular typo correction still remains) due to fragility of the solution. An RFC was posted here: https://discourse.llvm.org/t/rfc-removing-support-for-delayed-typo-correction/86631 and while that RFC was asking for folks to consider stepping up to be maintainers, and we did have a few new contributors show some interest, experiments show that it's likely worth it to remove this functionality entirely and focus efforts on improving regular typo correction. This removal fixes ~20 open issues (quite possibly more), improves compile time performance by roughly .3-.4% (https://llvm-compile-time-tracker.com/?config=Overview&stat=instructions%3Au&remote=AaronBallman&sortBy=date), and does not appear to regress diagnostic behavior in a way we wouldn't find acceptable. Fixes #<!-- -->142457 Fixes #<!-- -->139913 Fixes #<!-- -->138850 Fixes #<!-- -->137867 Fixes #<!-- -->137860 Fixes #<!-- -->107840 Fixes #<!-- -->93308 Fixes #<!-- -->69470 Fixes #<!-- -->59391 Fixes #<!-- -->58172 Fixes #<!-- -->46215 Fixes #<!-- -->45915 Fixes #<!-- -->45891 Fixes #<!-- -->44490 Fixes #<!-- -->36703 Fixes #<!-- -->32903 Fixes #<!-- -->23312 Fixes #<!-- -->69874 --- Patch is 232.63 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/143423.diff 114 Files Affected: - (modified) clang/include/clang/AST/Expr.h (+1-32) - (modified) clang/include/clang/AST/RecursiveASTVisitor.h (-1) - (modified) clang/include/clang/Basic/StmtNodes.td (-1) - (modified) clang/include/clang/Parse/Parser.h (+1-2) - (modified) clang/include/clang/Sema/Sema.h (+5-121) - (modified) clang/include/clang/Sema/SemaInternal.h (-14) - (modified) clang/lib/AST/Expr.cpp (-1) - (modified) clang/lib/AST/ExprClassification.cpp (-1) - (modified) clang/lib/AST/ExprConstant.cpp (-1) - (modified) clang/lib/AST/ItaniumMangle.cpp (-1) - (modified) clang/lib/AST/StmtPrinter.cpp (-5) - (modified) clang/lib/AST/StmtProfile.cpp (-4) - (modified) clang/lib/Parse/ParseCXXInlineMethods.cpp (-1) - (modified) clang/lib/Parse/ParseDecl.cpp (+8-25) - (modified) clang/lib/Parse/ParseDeclCXX.cpp (+2-6) - (modified) clang/lib/Parse/ParseExpr.cpp (+15-79) - (modified) clang/lib/Parse/ParseExprCXX.cpp (+3-10) - (modified) clang/lib/Parse/ParseInit.cpp (-2) - (modified) clang/lib/Parse/ParseObjc.cpp (+2-21) - (modified) clang/lib/Parse/ParseOpenACC.cpp (+7-21) - (modified) clang/lib/Parse/ParseOpenMP.cpp (+13-14) - (modified) clang/lib/Parse/ParseStmt.cpp (+5-11) - (modified) clang/lib/Parse/ParseStmtAsm.cpp (+1-1) - (modified) clang/lib/Parse/ParseTemplate.cpp (+1-2) - (modified) clang/lib/Sema/Sema.cpp (-9) - (modified) clang/lib/Sema/SemaChecking.cpp (-2) - (modified) clang/lib/Sema/SemaCoroutine.cpp (-12) - (modified) clang/lib/Sema/SemaDecl.cpp (+3-36) - (modified) clang/lib/Sema/SemaDeclCXX.cpp (+7-20) - (modified) clang/lib/Sema/SemaExceptionSpec.cpp (-1) - (modified) clang/lib/Sema/SemaExpr.cpp (+7-149) - (modified) clang/lib/Sema/SemaExprCXX.cpp (+1-375) - (modified) clang/lib/Sema/SemaExprMember.cpp (+4-112) - (modified) clang/lib/Sema/SemaLookup.cpp (-60) - (modified) clang/lib/Sema/SemaObjC.cpp (+1-6) - (modified) clang/lib/Sema/SemaOverload.cpp (+4-2) - (modified) clang/lib/Sema/SemaStmt.cpp (+3-11) - (modified) clang/lib/Sema/SemaStmtAttr.cpp (+2-3) - (modified) clang/lib/Sema/SemaTemplateVariadic.cpp (+1-11) - (modified) clang/lib/Sema/TreeTransform.h (-6) - (modified) clang/lib/Serialization/ASTReaderStmt.cpp (-4) - (modified) clang/lib/Serialization/ASTWriterStmt.cpp (-6) - (modified) clang/lib/StaticAnalyzer/Core/ExprEngine.cpp (-1) - (modified) clang/test/AST/ByteCode/literals.cpp (+6-2) - (modified) clang/test/AST/ast-dump-recovery.c (-30) - (modified) clang/test/AST/ast-dump-recovery.cpp (-214) - (removed) clang/test/AST/ast-dump-recovery.m (-32) - (modified) clang/test/CXX/drs/cwg1xx.cpp (+1-2) - (modified) clang/test/CXX/drs/cwg26xx.cpp (-1) - (modified) clang/test/CXX/module/basic/basic.link/p2.cppm (+2-2) - (removed) clang/test/FixIt/typo.cpp (-137) - (removed) clang/test/Index/complete-switch.c (-10) - (modified) clang/test/Index/fix-its.c (+2-17) - (modified) clang/test/Lexer/raw-string-ext.c (+5-5) - (modified) clang/test/Modules/diagnose-missing-import.m (-2) - (modified) clang/test/OpenMP/begin_declare_variant_messages.c (+1-1) - (modified) clang/test/OpenMP/declare_reduction_messages.cpp (+1-1) - (modified) clang/test/OpenMP/declare_variant_messages.c (+3-3) - (modified) clang/test/OpenMP/declare_variant_messages.cpp (+2-2) - (modified) clang/test/OpenMP/target_update_messages.cpp (+8-7) - (modified) clang/test/Parser/cxx1z-decomposition.cpp (+3-3) - (modified) clang/test/Parser/cxx1z-fold-expressions.cpp (+3-3) - (modified) clang/test/Parser/cxx2c-pack-indexing.cpp (+2-1) - (modified) clang/test/Parser/objc-foreach-syntax.m (+1-2) - (modified) clang/test/Parser/opencl-atomics-cl20.cl (+6-12) - (modified) clang/test/Parser/recovery.c (+1-1) - (modified) clang/test/Parser/switch-recovery.cpp (+1-1) - (modified) clang/test/Parser/switch-typo-correction.cpp (+2-2) - (modified) clang/test/ParserOpenACC/parse-cache-construct.cpp (+5-5) - (modified) clang/test/ParserOpenACC/parse-clauses.c (+7-17) - (modified) clang/test/ParserOpenACC/parse-constructs.cpp (+2-2) - (modified) clang/test/ParserOpenACC/parse-wait-clause.c (+1-4) - (modified) clang/test/ParserOpenACC/parse-wait-construct.c (+3-6) - (modified) clang/test/Sema/PR28181.c (+4-4) - (modified) clang/test/Sema/builtin-unary-fp.c (-1) - (added) clang/test/Sema/c23-delayed-typo-correction-crashes.c (+18) - (added) clang/test/Sema/delayed-typo-correction-crashes.c (+18) - (modified) clang/test/Sema/invalid-member.cpp (+4-2) - (modified) clang/test/Sema/typo-correction-ambiguity.cpp (+2-2) - (modified) clang/test/Sema/typo-correction-no-hang.c (+4-5) - (modified) clang/test/Sema/typo-correction-no-hang.cpp (+7-5) - (modified) clang/test/Sema/typo-correction-recursive.cpp (+14-14) - (modified) clang/test/Sema/typo-correction.c (+15-11) - (modified) clang/test/SemaCXX/arrow-operator.cpp (+4-5) - (modified) clang/test/SemaCXX/constant-expression-cxx11.cpp (+4-3) - (modified) clang/test/SemaCXX/conversion-function.cpp (+1-1) - (modified) clang/test/SemaCXX/coroutines.cpp (+7-13) - (added) clang/test/SemaCXX/cxx-delayed-typo-correction-crashes.cpp (+67) - (modified) clang/test/SemaCXX/cxx1z-decomposition.cpp (+2-1) - (added) clang/test/SemaCXX/cxx20-delayed-typo-correction-crashes.cpp (+19) - (modified) clang/test/SemaCXX/cxx2a-adl-only-template-id.cpp (+1-1) - (modified) clang/test/SemaCXX/destructor.cpp (+5-10) - (modified) clang/test/SemaCXX/invalid-if-constexpr.cpp (+7-3) - (modified) clang/test/SemaCXX/member-expr.cpp (+4-4) - (modified) clang/test/SemaCXX/nested-name-spec.cpp (+4-2) - (removed) clang/test/SemaCXX/pr13394-crash-on-invalid.cpp (-29) - (modified) clang/test/SemaCXX/return.cpp (+1-1) - (modified) clang/test/SemaCXX/typo-correction-crash.cpp (+8-11) - (modified) clang/test/SemaCXX/typo-correction-cxx11.cpp (+6-5) - (removed) clang/test/SemaCXX/typo-correction-delayed.cpp (-216) - (modified) clang/test/SemaCXX/typo-correction.cpp (+18-20) - (modified) clang/test/SemaCXX/virtuals.cpp (+1-3) - (modified) clang/test/SemaObjC/call-super-2.m (+1-1) - (modified) clang/test/SemaObjC/typo-correction-subscript.m (+1-2) - (modified) clang/test/SemaObjC/undef-arg-super-method-call.m (+4-4) - (modified) clang/test/SemaObjCXX/block-for-lambda-conversion.mm (+4-3) - (modified) clang/test/SemaOpenACC/compute-construct-num_gangs-clause.cpp (+2-4) - (modified) clang/test/SemaOpenCL/atomic-ops.cl (+1-1) - (modified) clang/test/SemaOpenCL/clang-builtin-version.cl (+2-6) - (modified) clang/test/SemaTemplate/concepts-recovery-expr.cpp (+2-2) - (modified) clang/test/SemaTemplate/concepts.cpp (+1-5) - (modified) clang/test/SemaTemplate/typo-variadic.cpp (+1-1) - (modified) clang/tools/libclang/CXCursor.cpp (-1) - (modified) clang/unittests/Sema/ExternalSemaSourceTest.cpp (-14) ``````````diff diff --git a/clang/include/clang/AST/Expr.h b/clang/include/clang/AST/Expr.h index 43c28c8bf649f..9fc23d30b733f 100644 --- a/clang/include/clang/AST/Expr.h +++ b/clang/include/clang/AST/Expr.h @@ -240,8 +240,7 @@ class Expr : public ValueStmt { return static_cast<bool>(getDependence() & ExprDependence::UnexpandedPack); } - /// Whether this expression contains subexpressions which had errors, e.g. a - /// TypoExpr. + /// Whether this expression contains subexpressions which had errors. bool containsErrors() const { return static_cast<bool>(getDependence() & ExprDependence::Error); } @@ -6965,36 +6964,6 @@ class AtomicExpr : public Expr { } }; -/// TypoExpr - Internal placeholder for expressions where typo correction -/// still needs to be performed and/or an error diagnostic emitted. -class TypoExpr : public Expr { - // The location for the typo name. - SourceLocation TypoLoc; - -public: - TypoExpr(QualType T, SourceLocation TypoLoc) - : Expr(TypoExprClass, T, VK_LValue, OK_Ordinary), TypoLoc(TypoLoc) { - assert(T->isDependentType() && "TypoExpr given a non-dependent type"); - setDependence(ExprDependence::TypeValueInstantiation | - ExprDependence::Error); - } - - child_range children() { - return child_range(child_iterator(), child_iterator()); - } - const_child_range children() const { - return const_child_range(const_child_iterator(), const_child_iterator()); - } - - SourceLocation getBeginLoc() const LLVM_READONLY { return TypoLoc; } - SourceLocation getEndLoc() const LLVM_READONLY { return TypoLoc; } - - static bool classof(const Stmt *T) { - return T->getStmtClass() == TypoExprClass; - } - -}; - /// This class represents BOTH the OpenMP Array Section and OpenACC 'subarray', /// with a boolean differentiator. /// OpenMP 5.0 [2.1.5, Array Sections]. diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h index b0f8ae621cf6d..5cb2f57edffe4 100644 --- a/clang/include/clang/AST/RecursiveASTVisitor.h +++ b/clang/include/clang/AST/RecursiveASTVisitor.h @@ -2956,7 +2956,6 @@ DEF_TRAVERSE_STMT(CXXRewrittenBinaryOperator, { } }) DEF_TRAVERSE_STMT(OpaqueValueExpr, {}) -DEF_TRAVERSE_STMT(TypoExpr, {}) DEF_TRAVERSE_STMT(RecoveryExpr, {}) DEF_TRAVERSE_STMT(CUDAKernelCallExpr, {}) diff --git a/clang/include/clang/Basic/StmtNodes.td b/clang/include/clang/Basic/StmtNodes.td index 9526fa5808aa5..c9c173f5c7469 100644 --- a/clang/include/clang/Basic/StmtNodes.td +++ b/clang/include/clang/Basic/StmtNodes.td @@ -202,7 +202,6 @@ def ShuffleVectorExpr : StmtNode<Expr>; def ConvertVectorExpr : StmtNode<Expr>; def BlockExpr : StmtNode<Expr>; def OpaqueValueExpr : StmtNode<Expr>; -def TypoExpr : StmtNode<Expr>; def RecoveryExpr : StmtNode<Expr>; def BuiltinBitCastExpr : StmtNode<ExplicitCastExpr>; def EmbedExpr : StmtNode<Expr>; diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h index 0b2fab4a45c96..5a3941556d9d0 100644 --- a/clang/include/clang/Parse/Parser.h +++ b/clang/include/clang/Parse/Parser.h @@ -4171,8 +4171,7 @@ class Parser : public CodeCompletionHandler { bool ParseExpressionList(SmallVectorImpl<Expr *> &Exprs, llvm::function_ref<void()> ExpressionStarts = llvm::function_ref<void()>(), - bool FailImmediatelyOnInvalidExpr = false, - bool EarlyTypoCorrection = false); + bool FailImmediatelyOnInvalidExpr = false); /// ParseSimpleExpressionList - A simple comma-separated list of expressions, /// used for misc language extensions. diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index f9a086b6966d9..15be7620f9ff4 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -6713,10 +6713,6 @@ class Sema final : public SemaBase { /// this expression evaluation context. unsigned NumCleanupObjects; - /// The number of typos encountered during this expression evaluation - /// context (i.e. the number of TypoExprs created). - unsigned NumTypos; - MaybeODRUseExprSet SavedMaybeODRUseExprs; /// The lambdas that are present within this context, if it @@ -6813,7 +6809,7 @@ class Sema final : public SemaBase { Decl *ManglingContextDecl, ExpressionKind ExprContext) : Context(Context), ParentCleanup(ParentCleanup), - NumCleanupObjects(NumCleanupObjects), NumTypos(0), + NumCleanupObjects(NumCleanupObjects), ManglingContextDecl(ManglingContextDecl), ExprContext(ExprContext), InDiscardedStatement(false), InImmediateFunctionContext(false), InImmediateEscalatingFunctionContext(false) {} @@ -7146,8 +7142,7 @@ class Sema final : public SemaBase { CorrectionCandidateCallback &CCC, TemplateArgumentListInfo *ExplicitTemplateArgs = nullptr, ArrayRef<Expr *> Args = {}, - DeclContext *LookupCtx = nullptr, - TypoExpr **Out = nullptr); + DeclContext *LookupCtx = nullptr); /// If \p D cannot be odr-used in the current expression evaluation context, /// return a reason explaining why. Otherwise, return NOUR_None. @@ -8747,40 +8742,6 @@ class Sema final : public SemaBase { ExprResult CheckUnevaluatedOperand(Expr *E); - /// Process any TypoExprs in the given Expr and its children, - /// generating diagnostics as appropriate and returning a new Expr if there - /// were typos that were all successfully corrected and ExprError if one or - /// more typos could not be corrected. - /// - /// \param E The Expr to check for TypoExprs. - /// - /// \param InitDecl A VarDecl to avoid because the Expr being corrected is its - /// initializer. - /// - /// \param RecoverUncorrectedTypos If true, when typo correction fails, it - /// will rebuild the given Expr with all TypoExprs degraded to RecoveryExprs. - /// - /// \param Filter A function applied to a newly rebuilt Expr to determine if - /// it is an acceptable/usable result from a single combination of typo - /// corrections. As long as the filter returns ExprError, different - /// combinations of corrections will be tried until all are exhausted. - ExprResult CorrectDelayedTyposInExpr( - Expr *E, VarDecl *InitDecl = nullptr, - bool RecoverUncorrectedTypos = false, - llvm::function_ref<ExprResult(Expr *)> Filter = - [](Expr *E) -> ExprResult { return E; }); - - ExprResult CorrectDelayedTyposInExpr( - ExprResult ER, VarDecl *InitDecl = nullptr, - bool RecoverUncorrectedTypos = false, - llvm::function_ref<ExprResult(Expr *)> Filter = - [](Expr *E) -> ExprResult { return E; }) { - return ER.isInvalid() - ? ER - : CorrectDelayedTyposInExpr(ER.get(), InitDecl, - RecoverUncorrectedTypos, Filter); - } - IfExistsResult CheckMicrosoftIfExistsSymbol(Scope *S, CXXScopeSpec &SS, const DeclarationNameInfo &TargetNameInfo); @@ -9282,12 +9243,6 @@ class Sema final : public SemaBase { /// for C++ records. llvm::FoldingSet<SpecialMemberOverloadResultEntry> SpecialMemberCache; - /// Holds TypoExprs that are created from `createDelayedTypo`. This is used by - /// `TransformTypos` in order to keep track of any TypoExprs that are created - /// recursively during typo correction and wipe them away if the correction - /// fails. - llvm::SmallVector<TypoExpr *, 2> TypoExprs; - enum class AcceptableKind { Visible, Reachable }; // Members have to be NamespaceDecl* or TranslationUnitDecl*. @@ -9375,10 +9330,6 @@ class Sema final : public SemaBase { bool VolatileArg, bool RValueThis, bool ConstThis, bool VolatileThis); - typedef std::function<void(const TypoCorrection &)> TypoDiagnosticGenerator; - typedef std::function<ExprResult(Sema &, TypoExpr *, TypoCorrection)> - TypoRecoveryCallback; - RedeclarationKind forRedeclarationInCurContext() const; /// Look up a name, looking for a single declaration. Return @@ -9732,51 +9683,6 @@ class Sema final : public SemaBase { const ObjCObjectPointerType *OPT = nullptr, bool RecordFailure = true); - /// Try to "correct" a typo in the source code by finding - /// visible declarations whose names are similar to the name that was - /// present in the source code. - /// - /// \param TypoName the \c DeclarationNameInfo structure that contains - /// the name that was present in the source code along with its location. - /// - /// \param LookupKind the name-lookup criteria used to search for the name. - /// - /// \param S the scope in which name lookup occurs. - /// - /// \param SS the nested-name-specifier that precedes the name we're - /// looking for, if present. - /// - /// \param CCC A CorrectionCandidateCallback object that provides further - /// validation of typo correction candidates. It also provides flags for - /// determining the set of keywords permitted. - /// - /// \param TDG A TypoDiagnosticGenerator functor that will be used to print - /// diagnostics when the actual typo correction is attempted. - /// - /// \param TRC A TypoRecoveryCallback functor that will be used to build an - /// Expr from a typo correction candidate. - /// - /// \param MemberContext if non-NULL, the context in which to look for - /// a member access expression. - /// - /// \param EnteringContext whether we're entering the context described by - /// the nested-name-specifier SS. - /// - /// \param OPT when non-NULL, the search for visible declarations will - /// also walk the protocols in the qualified interfaces of \p OPT. - /// - /// \returns a new \c TypoExpr that will later be replaced in the AST with an - /// Expr representing the result of performing typo correction, or nullptr if - /// typo correction is not possible. If nullptr is returned, no diagnostics - /// will be emitted and it is the responsibility of the caller to emit any - /// that are needed. - TypoExpr *CorrectTypoDelayed( - const DeclarationNameInfo &Typo, Sema::LookupNameKind LookupKind, - Scope *S, CXXScopeSpec *SS, CorrectionCandidateCallback &CCC, - TypoDiagnosticGenerator TDG, TypoRecoveryCallback TRC, - CorrectTypoKind Mode, DeclContext *MemberContext = nullptr, - bool EnteringContext = false, const ObjCObjectPointerType *OPT = nullptr); - /// Kinds of missing import. Note, the values of these enumerators correspond /// to %select values in diagnostics. enum class MissingImportKind { @@ -9795,20 +9701,6 @@ class Sema final : public SemaBase { SourceLocation DeclLoc, ArrayRef<Module *> Modules, MissingImportKind MIK, bool Recover); - struct TypoExprState { - std::unique_ptr<TypoCorrectionConsumer> Consumer; - TypoDiagnosticGenerator DiagHandler; - TypoRecoveryCallback RecoveryHandler; - TypoExprState(); - TypoExprState(TypoExprState &&other) noexcept; - TypoExprState &operator=(TypoExprState &&other) noexcept; - }; - - const TypoExprState &getTypoExprState(TypoExpr *TE) const; - - /// Clears the state of the given TypoExpr. - void clearDelayedTypo(TypoExpr *TE); - /// Called on #pragma clang __debug dump II void ActOnPragmaDump(Scope *S, SourceLocation Loc, IdentifierInfo *II); @@ -9831,23 +9723,15 @@ class Sema final : public SemaBase { /// Determine if we could use all the declarations in the module. bool isUsableModule(const Module *M); - /// Helper for CorrectTypo and CorrectTypoDelayed used to create and - /// populate a new TypoCorrectionConsumer. Returns nullptr if typo correction - /// should be skipped entirely. + /// Helper for CorrectTypo used to create and populate a new + /// TypoCorrectionConsumer. Returns nullptr if typo correction should be + /// skipped entirely. std::unique_ptr<TypoCorrectionConsumer> makeTypoCorrectionConsumer( const DeclarationNameInfo &Typo, Sema::LookupNameKind LookupKind, Scope *S, CXXScopeSpec *SS, CorrectionCandidateCallback &CCC, DeclContext *MemberContext, bool EnteringContext, const ObjCObjectPointerType *OPT, bool ErrorRecovery); - /// The set of unhandled TypoExprs and their associated state. - llvm::MapVector<TypoExpr *, TypoExprState> DelayedTypos; - - /// Creates a new TypoExpr AST node. - TypoExpr *createDelayedTypo(std::unique_ptr<TypoCorrectionConsumer> TCC, - TypoDiagnosticGenerator TDG, - TypoRecoveryCallback TRC, SourceLocation TypoLoc); - /// Cache for module units which is usable for current module. llvm::DenseSet<const Module *> UsableModuleUnitsCache; diff --git a/clang/include/clang/Sema/SemaInternal.h b/clang/include/clang/Sema/SemaInternal.h index 95874077050a9..4d0da1102bb59 100644 --- a/clang/include/clang/Sema/SemaInternal.h +++ b/clang/include/clang/Sema/SemaInternal.h @@ -314,20 +314,6 @@ class TypoCorrectionConsumer : public VisibleDeclConsumer { bool SearchNamespaces; }; -inline Sema::TypoExprState::TypoExprState() {} - -inline Sema::TypoExprState::TypoExprState(TypoExprState &&other) noexcept { - *this = std::move(other); -} - -inline Sema::TypoExprState &Sema::TypoExprState:: -operator=(Sema::TypoExprState &&other) noexcept { - Consumer = std::move(other.Consumer); - DiagHandler = std::move(other.DiagHandler); - RecoveryHandler = std::move(other.RecoveryHandler); - return *this; -} - } // end namespace clang #endif diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index 17d2cb4a30f30..c3722c65abf6e 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -3611,7 +3611,6 @@ bool Expr::HasSideEffects(const ASTContext &Ctx, case PackExpansionExprClass: case SubstNonTypeTemplateParmPackExprClass: case FunctionParmPackExprClass: - case TypoExprClass: case RecoveryExprClass: case CXXFoldExprClass: // Make a conservative assumption for dependent nodes. diff --git a/clang/lib/AST/ExprClassification.cpp b/clang/lib/AST/ExprClassification.cpp index 3f37d06cc8f3a..ad66335138a42 100644 --- a/clang/lib/AST/ExprClassification.cpp +++ b/clang/lib/AST/ExprClassification.cpp @@ -129,7 +129,6 @@ static Cl::Kinds ClassifyInternal(ASTContext &Ctx, const Expr *E) { // FIXME: Is this wise? Should they get their own kind? case Expr::UnresolvedLookupExprClass: case Expr::UnresolvedMemberExprClass: - case Expr::TypoExprClass: case Expr::DependentCoawaitExprClass: case Expr::CXXDependentScopeMemberExprClass: case Expr::DependentScopeDeclRefExprClass: diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index fa4e10e84de05..5ff2a7c1b9b38 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -17326,7 +17326,6 @@ static ICEDiag CheckICE(const Expr* E, const ASTContext &Ctx) { case Expr::CXXDeleteExprClass: case Expr::CXXPseudoDestructorExprClass: case Expr::UnresolvedLookupExprClass: - case Expr::TypoExprClass: case Expr::RecoveryExprClass: case Expr::DependentScopeDeclRefExprClass: case Expr::CXXConstructExprClass: diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp index ecf5be220439b..487933a748ab8 100644 --- a/clang/lib/AST/ItaniumMangle.cpp +++ b/clang/lib/AST/ItaniumMangle.cpp @@ -4994,7 +4994,6 @@ void CXXNameMangler::mangleExpression(const Expr *E, unsigned Arity, case Expr::ParenListExprClass: case Expr::MSPropertyRefExprClass: case Expr::MSPropertySubscriptExprClass: - case Expr::TypoExprClass: // This should no longer exist in the AST by now. case Expr::RecoveryExprClass: case Expr::ArraySectionExprClass: case Expr::OMPArrayShapingExprClass: diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp index 13c3bc0387890..28317911d825b 100644 --- a/clang/lib/AST/StmtPrinter.cpp +++ b/clang/lib/AST/StmtPrinter.cpp @@ -2914,11 +2914,6 @@ void StmtPrinter::VisitOpaqueValueExpr(OpaqueValueExpr *Node) { PrintExpr(Node->getSourceExpr()); } -void StmtPrinter::VisitTypoExpr(TypoExpr *Node) { - // TODO: Print something reasonable for a TypoExpr, if necessary. - llvm_unreachable("Cannot print TypoExpr nodes"); -} - void StmtPrinter::VisitRecoveryExpr(RecoveryExpr *Node) { OS << "<recovery-expr>("; const char *Sep = ""; diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp index f7d1655f67ed1..c666d966a6e58 100644 --- a/clang/lib/AST/StmtProfile.cpp +++ b/clang/lib/AST/StmtProfile.cpp @@ -2361,10 +2361,6 @@ void StmtProfiler::VisitOpaqueValueExpr(const OpaqueValueExpr *E) { VisitExpr(E); } -void StmtProfiler::VisitTypoExpr(const TypoExpr *E) { - VisitExpr(E); -} - void StmtProfiler::VisitSourceLocExpr(const SourceLocExpr *E) { VisitExpr(E); } diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index e215c64cccd11..9a010fb5f3427 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -422,7 +422,6 @@ void Parser::ParseLexedMethodDeclaration(LateParsedMethodDeclaration &LM) { DefArgResult = ParseBraceInitializer(); } else DefArgResult = ParseAssignmentExpression(); - DefArgResult = Actions.CorrectDelayedTyposInExpr(DefArgResult, Param); if (DefArgResult.isInvalid()) { Actions.ActOnParamDefaultArgumentError(Param, EqualLoc, /*DefaultArg=*/nullptr); diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index f469e466e4634..647ee34efcabc 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -436,7 +436,6 @@ bool Parser::ParseAttributeArgumentList( } else { Expr = ParseAssignmentExpression(); } - Expr = Actions.CorrectDelayedTyposInExpr(Expr); if (Tok.is(tok::ellipsis)) Expr = Actions.ActOnPackExpansion(Expr.get(), ConsumeToken()); @@ -472,15 +471,6 @@ bool Parser::ParseAttributeArgumentList( Arg++; } - if (SawError) { - // Ensure typos get diagnosed when errors were encountered while parsing the - // expression list. - for (auto &E : Exprs) { - ExprResult Expr = Actions.CorrectDelayedTyposInExpr(E); - if (Expr.isUsable()) - E = Expr.get(); - } - } return SawError; } @@ -565,9 +555,7 @@ unsigned Parser::ParseAttributeArgsCommon( nullptr, Sema::ExpressionEvaluationContextRecord::EK_AttrArgument); - ExprResult ArgExpr( - Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression())); - + ExprResult ArgExpr = ParseAssignmentExpression(); if (ArgExpr.isInvalid()) { SkipUntil(tok::r_paren, StopAtSemi); return 0; @@ -3212,9 +3200,7 @@ void Parser::ParseBoundsAttribute(IdentifierInfo &AttrName, Actions, Sema::ExpressionEvaluationContext::PotentiallyEvaluated, nullptr, ExpressionKind::EK_AttrArgument); - ExprResult ArgExpr( - Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression())); - + ExprResult ArgExpr = ParseAssignmentExpression(); if (ArgExpr.isInvalid()) { Parens.skipToEnd(); return; @@ -6890,8 +6876,8 @@ void Parser::ParseDirectDeclarator(Declarator &D) { // void (f()) requires true; Diag(Tok, diag::err_requires_clause_inside_parens); ConsumeToken(); - ExprResult TrailingRequiresClause = Actions.CorrectDelayedTyposInExpr( - ParseConstraintLogicalOrExpression(/*IsTrailingRequiresClause=*/true)); + ExprResult TrailingRequiresClause = + ParseConstraintLogicalOrExpression(/*IsTrailingRequiresClause=*/true); if (TrailingRequiresClause.isUsable() && D.isFunctionDeclarator() && !D.hasTrailingRequiresClause()) // We're already ill-formed if we got here but we'll accept it anyway. @@ -7538,8 +7524,7 @@ void Parser::ParseParameterDeclarationClause( Diag(Tok, diag::err_requires_clause_on_declarator_not_de... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/143423 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
