Skip to content

Commit

Permalink
Merge pull request #15627 from andrey-golubev:fix_perform_subst
Browse files Browse the repository at this point in the history
  • Loading branch information
alalek committed Oct 2, 2019
2 parents 3fb6617 + d50babf commit 53c88f0
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion modules/gapi/src/compiler/passes/perform_substitution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,19 @@ void performSubstitution(GModel::Graph& graph,
const auto& patternDataNode = std::get<0>(it);
const auto& substituteDataNode = std::get<1>(it);
const auto& graphDataNode = patternToGraphMatch.outputDataNodes.at(patternDataNode);

// delete existing edges (otherwise we cannot redirect)
for (auto e : graphDataNode->inEdges()) {
auto existingEdges = graphDataNode->inEdges();
// NB: we cannot iterate over node->inEdges() here directly because it gets modified when
// edges are erased. Erasing an edge supposes that src/dst nodes will remove
// (correspondingly) out/in edge (which is _our edge_). Now, this deleting means
// node->inEdges() will also get updated in the process: so, we'd iterate over a
// container which changes in this case. Using supplementary std::vector instead:
std::vector<ade::EdgeHandle> handles(existingEdges.begin(), existingEdges.end());
for (const auto& e : handles) {
graph.erase(e);
}

GModel::redirectWriter(graph, substituteDataNode, graphDataNode);
}

Expand Down

0 comments on commit 53c88f0

Please sign in to comment.