From 5f684e90c2f44eda979573a01c2ed063d9adc7a8 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 16 Nov 2012 18:39:22 +0000 Subject: Fix partial-match-bind-behavior with forEachDescendant() matchers. The problem is that a partial match of an (explicit or implicit) allOf matcher binds results, i.e. recordDecl(decl().bind("x"), hasName("A")) can very well bind a record that is not named "A". With this fix, the common cases of stumbling over this bug are fixed by the BoundNodesMap overwriting the results of a partial match. An error can still be created with a weird combination of anyOf and allOf (see inactive test). We need to decide whether this is worth fixing, as the fix will have performance impact. Review: http://llvm-reviews.chandlerc.com/D124 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@168177 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ASTMatchers/ASTMatchersInternal.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/ASTMatchers') diff --git a/lib/ASTMatchers/ASTMatchersInternal.cpp b/lib/ASTMatchers/ASTMatchersInternal.cpp index 408195d369..f1a9ff2e09 100644 --- a/lib/ASTMatchers/ASTMatchersInternal.cpp +++ b/lib/ASTMatchers/ASTMatchersInternal.cpp @@ -27,8 +27,11 @@ void BoundNodesMap::copyTo(BoundNodesTreeBuilder *Builder) const { } void BoundNodesMap::copyTo(BoundNodesMap *Other) const { - copy(NodeMap.begin(), NodeMap.end(), - inserter(Other->NodeMap, Other->NodeMap.begin())); + for (IDToNodeMap::const_iterator I = NodeMap.begin(), + E = NodeMap.end(); + I != E; ++I) { + Other->NodeMap[I->first] = I->second; + } } BoundNodesTree::BoundNodesTree() {} -- cgit v1.2.3-18-g5258