From: Reid Spencer Date: Wed, 17 Jan 2007 02:23:37 +0000 (+0000) Subject: For PR1094: X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7af9a13f3a1d9f45c563c7184bb5abe51fdbaf00;p=oota-llvm.git For PR1094: Adjust the use of SetVector for changes in SetVector's interface. Patch by Gordon Henriksen. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33280 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Scalar/PredicateSimplifier.cpp b/lib/Transforms/Scalar/PredicateSimplifier.cpp index 70643f2f1cc..47066ab76a9 100644 --- a/lib/Transforms/Scalar/PredicateSimplifier.cpp +++ b/lib/Transforms/Scalar/PredicateSimplifier.cpp @@ -857,8 +857,8 @@ namespace { // See if one of the nodes about to be removed is actually a better // canonical choice than n1. unsigned orig_n1 = n1; - std::vector::iterator DontRemove = Remove.end(); - for (std::vector::iterator I = Remove.begin()+1 /* skip n2 */, + SetVector::iterator DontRemove = Remove.end(); + for (SetVector::iterator I = Remove.begin()+1 /* skip n2 */, E = Remove.end(); I != E; ++I) { unsigned n = *I; Value *V = IG.node(n)->getValue(); @@ -949,7 +949,7 @@ namespace { // Migrate relationships from removed nodes to N1. Node *N1 = IG.node(n1); - for (std::vector::iterator I = Remove.begin(), E = Remove.end(); + for (SetVector::iterator I = Remove.begin(), E = Remove.end(); I != E; ++I) { unsigned n = *I; Node *N = IG.node(n); @@ -972,7 +972,7 @@ namespace { if (!n2) IG.addEquality(n1, V2, Top); else { - for (std::vector::iterator I = Remove.begin(), + for (SetVector::iterator I = Remove.begin(), E = Remove.end(); I != E; ++I) { IG.addEquality(n1, IG.node(*I)->getValue(), Top); }