From: Duncan Sands <baldrick@free.fr>
Date: Fri, 16 Apr 2010 19:28:59 +0000 (+0000)
Subject: Revert commit 101503 (johannes), in the hope of fixing the dragonegg build,
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=f72a53db4453a45aca282bd13c1f2dbe40a08466

Revert commit 101503 (johannes), in the hope of fixing the dragonegg build,
see http://google1.osuosl.org:8011/builders/dragonegg-x86_64-linux/builds/693
Original commit text:
Use a ValueMap not a std::map for the reason indicated
in the comment.  This was causing nondeterministic changes
in inlining decisions.


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

diff --git a/include/llvm/Analysis/InlineCost.h b/include/llvm/Analysis/InlineCost.h
index ab0b84524af..ea913bd5e66 100644
--- a/include/llvm/Analysis/InlineCost.h
+++ b/include/llvm/Analysis/InlineCost.h
@@ -18,7 +18,6 @@
 #include <climits>
 #include <vector>
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/ValueMap.h"
 
 namespace llvm {
 
@@ -165,9 +164,7 @@ namespace llvm {
       void analyzeFunction(Function *F);
     };
 
-    // The Function* for a function can be changed (by ArgumentPromotion);
-    // the ValueMap will update itself when this happens.
-    ValueMap<const Function *, FunctionInfo> CachedFunctionInfo;
+    std::map<const Function *, FunctionInfo> CachedFunctionInfo;
 
   public: