hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 02:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Swift: Extract parameters to closure expressions.

Browse Source
This commit is contained in:
Mathias Vorreiter Pedersen
2022-06-14 20:38:57 +01:00
parent 70e5cf786b
commit 4595a9cf0b
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swift/codegen/schema.yml
View File

@@ -288,6 +288,8 @@ ValueDecl:
AbstractClosureExpr:
_extends: Expr
_children:
params: ParamDecl*
AnyTryExpr:
_extends: Expr

12
swift/extractor/visitors/ExprVisitor.h
View File

@@ -368,6 +368,7 @@ class ExprVisitor : public AstVisitorBase<ExprVisitor> {
assert(expr->getBody() && "ClosureExpr has getBody()");
auto bodyLabel = dispatcher_.fetchLabel(expr->getBody());
dispatcher_.emit(ClosureExprsTrap{label, bodyLabel});
emitAbstractClosureExpr(expr, label);
}
void visitAutoClosureExpr(swift::AutoClosureExpr* expr) {
@@ -375,6 +376,7 @@ class ExprVisitor : public AstVisitorBase<ExprVisitor> {
assert(expr->getBody() && "AutoClosureExpr has getBody()");
auto bodyLabel = dispatcher_.fetchLabel(expr->getBody());
dispatcher_.emit(AutoClosureExprsTrap{label, bodyLabel});
emitAbstractClosureExpr(expr, label);
}
void visitCoerceExpr(swift::CoerceExpr* expr) {
@@ -534,6 +536,16 @@ class ExprVisitor : public AstVisitorBase<ExprVisitor> {
}
private:
void emitAbstractClosureExpr(swift::AbstractClosureExpr* expr,
TrapLabel<AbstractClosureExprTag> label) {
assert(expr->getParameters() && "AbstractClosureExpr has getParameters()");
auto params = expr->getParameters();
for (auto i = 0u; i < params->size(); ++i) {
dispatcher_.emit(
AbstractClosureExprParamsTrap{label, i, dispatcher_.fetchLabel(params->get(i))});
}
}
TrapLabel<ArgumentTag> emitArgument(const swift::Argument& arg) {
auto argLabel = dispatcher_.createLabel<ArgumentTag>();
assert(arg.getExpr() && "Argument has getExpr");