From: Duncan P. N. Exon Smith Date: Fri, 9 Oct 2015 00:03:57 +0000 (+0000) Subject: Support: Partially revert r249782 to unbreak clang build X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4100fc009b56a849ea878b6e0375caa5992ba91b;p=oota-llvm.git 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249783 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Support/GenericDomTree.h b/include/llvm/Support/GenericDomTree.h index 8751f272cd2..a790d754d20 100644 --- a/include/llvm/Support/GenericDomTree.h +++ b/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>(*this, F);