Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions clang/lib/Sema/SemaStmt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}

Expand Down
Loading