Don't use std::set_difference when the two sets are sorted differently. Compute

the difference manually instead.

This allows GVNPRE to produce correct analysis for the example in the GVNPRE
paper.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37425 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/Transforms/Scalar/GVNPRE.cpp b/lib/Transforms/Scalar/GVNPRE.cpp
index 4f327663c1..2bedd1cdea 100644
--- a/lib/Transforms/Scalar/GVNPRE.cpp
+++ b/lib/Transforms/Scalar/GVNPRE.cpp
@@ -420,13 +420,12 @@ bool GVNPRE::runOnFunction(Function &F) {
                      s_ins, ExprLT());
       
       anticIn.clear();
-      std::insert_iterator<std::set<Value*, ExprLT> >  antic_ins(anticIn, 
-                                                             anticIn.begin());
-      std::set_difference(S.begin(), S.end(),
-                          generatedTemporaries[BB].begin(),
-                          generatedTemporaries[BB].end(),
-                          antic_ins,
-                          ExprLT());
+      
+      for (std::set<Value*, ExprLT>::iterator I = S.begin(), E = S.end();
+           I != E; ++I) {
+        if (generatedTemporaries[BB].find(*I) == generatedTemporaries[BB].end())
+          anticIn.insert(*I);
+      }
       
       clean(VN, anticIn);