[llvm-commits] [llvm] r101525 - /llvm/trunk/include/llvm/Analysis/InlineCost.h

[Dale Johannesen]

On Apr 16, 2010, at 1:28 PMPDT, Chris Lattner wrote:

> 
> On Apr 16, 2010, at 12:28 PM, Duncan Sands wrote:
> 
>> Author: baldrick
>> Date: Fri Apr 16 14:28:59 2010
>> New Revision: 101525
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=101525&view=rev
>> Log:
>> 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.
> 
> I think that Dan fixed this in r101528, can you reapply this?

Not exactly, after I applied this Dan applied another patch on top of it to remove #include <map>. Reverting mine but not his broke things.  Dan later reverted his.

Let me know how this goes, this patch works well for me.  There is another unrelated nondeterminism bug, and it's possible this patch exposes that one.

> -Chris
> 
>> 
>> Modified:
>>   llvm/trunk/include/llvm/Analysis/InlineCost.h
>> 
>> Modified: llvm/trunk/include/llvm/Analysis/InlineCost.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/InlineCost.h?rev=101525&r1=101524&r2=101525&view=diff
>> ==============================================================================
>> --- llvm/trunk/include/llvm/Analysis/InlineCost.h (original)
>> +++ llvm/trunk/include/llvm/Analysis/InlineCost.h Fri Apr 16 14:28:59 2010
>> @@ -18,7 +18,6 @@
>> #include <climits>
>> #include <vector>
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/ValueMap.h"
>> 
>> namespace llvm {
>> 
>> @@ -165,9 +164,7 @@
>>      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:
>> 
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits