diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2015-10-09 00:03:57 +0000 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2015-10-09 00:03:57 +0000 |
commit | d837cd044fd21ba182d4af49d3885dcd59a5d6a4 (patch) | |
tree | 8bde5fc5648b35cdfa12f18eb4635042233c1688 /llvm | |
parent | 52888a673859a5047acd08d60b43f173d126c8e7 (diff) | |
download | bcm5719-llvm-d837cd044fd21ba182d4af49d3885dcd59a5d6a4.tar.gz bcm5719-llvm-d837cd044fd21ba182d4af49d3885dcd59a5d6a4.zip |
Support: Partially revert r249782 to unbreak clang build
Apparently the iterators in `clang::CFGBlock` have an auto-conversion to
`CFGBlock *`, but the dereference operator gives `const CFGBlock &`.
Until I have a moment to fix that, revert the GenericDomTree chagnes
from r249782.
llvm-svn: 249783
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/include/llvm/Support/GenericDomTree.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/include/llvm/Support/GenericDomTree.h b/llvm/include/llvm/Support/GenericDomTree.h index 8751f272cd2..a790d754d20 100644 --- a/llvm/include/llvm/Support/GenericDomTree.h +++ b/llvm/include/llvm/Support/GenericDomTree.h @@ -734,13 +734,13 @@ public: for (typename TraitsTy::nodes_iterator I = TraitsTy::nodes_begin(&F), E = TraitsTy::nodes_end(&F); I != E; ++I) { - if (TraitsTy::child_begin(&*I) == TraitsTy::child_end(&*I)) - addRoot(&*I); + if (TraitsTy::child_begin(I) == TraitsTy::child_end(I)) + addRoot(I); // Prepopulate maps so that we don't get iterator invalidation issues // later. - this->IDoms[&*I] = nullptr; - this->DomTreeNodes[&*I] = nullptr; + this->IDoms[I] = nullptr; + this->DomTreeNodes[I] = nullptr; } Calculate<FT, Inverse<NodeT *>>(*this, F); |