https://github.com/GkvJwa updated https://github.com/llvm/llvm-project/pull/172287
>From 1dc5b737beeb3062bafc6e8221aeb9cef9b1b77b Mon Sep 17 00:00:00 2001 From: GkvJwa <[email protected]> Date: Wed, 17 Dec 2025 01:02:42 +0800 Subject: [PATCH] Add check object --- clang/lib/Sema/SemaStmt.cpp | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 1b1643250d05e..c64029f269c2b 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -4553,6 +4553,45 @@ StmtResult Sema::ActOnSEHTryBlock(bool IsCXXTry, SourceLocation TryLoc, return SEHTryStmt::Create(Context, IsCXXTry, TryLoc, TryBlock, Handler); } +static bool containsNonTrivialObject(Sema &S, const Stmt *Node) { + (void)S; + if (!Node) + return false; + + if (const DeclStmt *DS = dyn_cast<DeclStmt>(Node)) { + for (const Decl *D : DS->decls()) { + if (const VarDecl *VD = dyn_cast<VarDecl>(D)) { + QualType T = VD->getType(); + if (const RecordType *RT = T->getAs<RecordType>()) { + if (const CXXRecordDecl *RD = RT->getAsCXXRecordDecl()) { + if (RD->hasDefinition() && !RD->hasTrivialDestructor()) + return true; + } + } + } + } + } + + if (const Expr *E = dyn_cast<Expr>(Node)) { + QualType T = E->getType(); + if (T->isRecordType() && E->getValueKind() != VK_LValue) { + if (const RecordType *RT = T->getAs<RecordType>()) { + if (const CXXRecordDecl *RD = RT->getAsCXXRecordDecl()) { + if (RD->hasDefinition() && !RD->hasTrivialDestructor()) + return true; + } + } + } + } + + // children. + for (const Stmt *Child : Node->children()) + if (containsNonTrivialObject(S, Child)) + return true; + + return false; +} + StmtResult Sema::ActOnSEHExceptBlock(SourceLocation Loc, Expr *FilterExpr, Stmt *Block) { assert(FilterExpr && Block); @@ -4562,6 +4601,10 @@ StmtResult Sema::ActOnSEHExceptBlock(SourceLocation Loc, Expr *FilterExpr, Diag(FilterExpr->getExprLoc(), diag::err_filter_expression_integral) << FTy); } + if (containsNonTrivialObject(*this, Block)) { + Diag(Loc, diag::err_seh_try_outside_functions); + return StmtError(); + } return SEHExceptStmt::Create(Context, Loc, FilterExpr, Block); } _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
