← Back to branch summary

~ubuntu-branches/ubuntu/maverick/clamav/maverick-updates

« back to all changes in this revision

Viewing changes to libclamav/c++/llvm/include/llvm/Analysis/DominatorInternals.h

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-17 12:30:20 UTC
  • mfrom: (97.1.1 maverick-proposed)
  • Revision ID: james.westby@ubuntu.com-20101217123020-o02fhyzykv5z98ri
Tags: 0.96.5+dfsg-1ubuntu1.10.10.1
https://launchpad.net/bugs/691414
* Microversion update for Maverick (LP: #691414)
  - Improved database login times
  - Expanded use of new bytecode signatures
  - Other bugfixes/improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/c++/llvm/include/llvm/Analysis/DominatorInternals.h
152
152
}
153
153
 
154
154
template<class GraphT>
155
 
typename GraphT::NodeType* Eval(DominatorTreeBase<typename GraphT::NodeType>& DT,
156
 
                                typename GraphT::NodeType *V) {
 
155
typename GraphT::NodeType* 
 
156
Eval(DominatorTreeBase<typename GraphT::NodeType>& DT,
 
157
     typename GraphT::NodeType *V) {
157
158
  typename DominatorTreeBase<typename GraphT::NodeType>::InfoRec &VInfo =
158
159
                                                                     DT.Info[V];
159
160
#if !BALANCE_IDOM_TREE
265
266
 
266
267
    // initialize the semi dominator to point to the parent node
267
268
    WInfo.Semi = WInfo.Parent;
268
 
    for (typename GraphTraits<Inverse<NodeT> >::ChildIteratorType CI =
269
 
         GraphTraits<Inverse<NodeT> >::child_begin(W),
270
 
         E = GraphTraits<Inverse<NodeT> >::child_end(W); CI != E; ++CI)
271
 
      if (DT.Info.count(*CI)) {  // Only if this predecessor is reachable!
272
 
        unsigned SemiU = DT.Info[Eval<GraphT>(DT, *CI)].Semi;
 
269
    typedef GraphTraits<Inverse<NodeT> > InvTraits;
 
270
    for (typename InvTraits::ChildIteratorType CI =
 
271
         InvTraits::child_begin(W),
 
272
         E = InvTraits::child_end(W); CI != E; ++CI) {
 
273
      typename InvTraits::NodeType *N = *CI;
 
274
      if (DT.Info.count(N)) {  // Only if this predecessor is reachable!
 
275
        unsigned SemiU = DT.Info[Eval<GraphT>(DT, N)].Semi;
273
276
        if (SemiU < WInfo.Semi)
274
277
          WInfo.Semi = SemiU;
275
278
      }
 
279
    }
276
280
 
277
281
    DT.Info[DT.Vertex[WInfo.Semi]].Bucket.push_back(W);
278
282