averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit] Use stack of argument mappings when walking the syntax model

Browse Source 
A single map of arguments allows an argument to be added to an incorrect
node, eg. when the parent node isn't handled but the argument is mapped.
Use a stack of (parent, mappings) instead and check that the parent
matches to ensure this cannot happen.
This commit is contained in:
Ben Barham
2021-12-01 09:24:55 +10:00
parent 9180e010c1
commit 3ceb0a30df
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/IDE/SyntaxModel.cpp
View File

@@ -361,11 +361,12 @@ class ModelASTWalker : public ASTWalker {
friend class InactiveClauseRAII;
bool inInactiveClause = false;
struct ParentArgsTy {
Expr *Parent = nullptr;
llvm::DenseMap<Expr *, Argument> Args;
};
/// A mapping of argument expressions to their full argument info.
llvm::DenseMap<Expr *, Argument> ArgumentInfo;
/// The number of ArgumentList parents in the walk.
unsigned ArgumentListDepth = 0;
SmallVector<ParentArgsTy, 4> ParentArgs;
public:
SyntaxModelWalker &Walker;
@@ -528,21 +529,27 @@ static bool shouldTreatAsSingleToken(const SyntaxStructureNode &Node,
std::pair<bool, ArgumentList *>
ModelASTWalker::walkToArgumentListPre(ArgumentList *ArgList) {
Expr *ParentExpr = Parent.getAsExpr();
if (!ParentExpr)
return {true, ArgList};
ParentArgsTy Mapping;
Mapping.Parent = ParentExpr;
for (auto Arg : *ArgList) {
auto res = ArgumentInfo.insert({Arg.getExpr(), Arg});
auto res = Mapping.Args.try_emplace(Arg.getExpr(), Arg);
assert(res.second && "Duplicate arguments?");
(void)res;
}
ArgumentListDepth += 1;
ParentArgs.push_back(std::move(Mapping));
return {true, ArgList};
}
ArgumentList *ModelASTWalker::walkToArgumentListPost(ArgumentList *ArgList) {
// If there are no more argument lists above us, we can clear out the argument
// mapping to save memory.
ArgumentListDepth -= 1;
if (ArgumentListDepth == 0)
ArgumentInfo.clear();
if (Expr *ParentExpr = Parent.getAsExpr()) {
assert(ParentExpr == ParentArgs.back().Parent &&
"Unmatched walkToArgumentList(Pre|Post)");
ParentArgs.pop_back();
}
return ArgList;
}
@@ -573,9 +580,14 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
pushStructureNode(SN, Elem);
};
auto Arg = ArgumentInfo.find(E);
if (Arg != ArgumentInfo.end())
addCallArgExpr(Arg->second);
if (auto *ParentExpr = Parent.getAsExpr()) {
if (!ParentArgs.empty() && ParentArgs.back().Parent == ParentExpr) {
auto &ArgumentInfo = ParentArgs.back().Args;
auto Arg = ArgumentInfo.find(E);
if (Arg != ArgumentInfo.end())
addCallArgExpr(Arg->second);
}
}
if (E->isImplicit())
return { true, E };