[llvm] r215341 - Revert "Increase the size of this SmallVector in PeepholeOptimizer." (r215340)

[Hans Wennborg]

On Mon, Aug 11, 2014 at 9:48 AM, Eric Christopher <echristo at gmail.com> wrote:
> Can you switch the one use to a SmallPtrSetImpl<MachineInstr *> the
> way we do for SmallVector?

Chandler and Craig pointed out this too. It was fixed in r215356.

Cheers,
Hans

> On Sun, Aug 10, 2014 at 7:34 PM, Hans Wennborg <hans at hanshq.net> wrote:
>> Author: hans
>> Date: Sun Aug 10 21:34:52 2014
>> New Revision: 215341
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=215341&view=rev
>> Log:
>> Revert "Increase the size of this SmallVector in PeepholeOptimizer." (r215340)
>>
>> That broke the build:
>>
>> /data/buildslave/clang-amd64-freebsd/src-llvm/lib/CodeGen/PeepholeOptimizer.cpp:729:46: error: non-const lvalue reference to type 'SmallPtrSet<[...], 8>' cannot bind to a value of unrelated type 'SmallPtrSet<[...], 16>'
>>         Changed |= optimizeExtInstr(MI, MBB, LocalMIs);
>>                                              ^~~~~~~~
>> /data/buildslave/clang-amd64-freebsd/src-llvm/lib/CodeGen/PeepholeOptimizer.cpp:265:49: note: passing argument to parameter 'LocalMIs' here
>>                  SmallPtrSet<MachineInstr*, 8> &LocalMIs) {
>>                                                 ^
>>
>>
>>
>> Modified:
>>     llvm/trunk/lib/CodeGen/PeepholeOptimizer.cpp
>>
>> Modified: llvm/trunk/lib/CodeGen/PeepholeOptimizer.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PeepholeOptimizer.cpp?rev=215341&r1=215340&r2=215341&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/CodeGen/PeepholeOptimizer.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/PeepholeOptimizer.cpp Sun Aug 10 21:34:52 2014
>> @@ -687,7 +687,7 @@ bool PeepholeOptimizer::runOnMachineFunc
>>      MachineBasicBlock *MBB = &*I;
>>
>>      bool SeenMoveImm = false;
>> -    SmallPtrSet<MachineInstr*, 16> LocalMIs;
>> +    SmallPtrSet<MachineInstr*, 8> LocalMIs;
>>      SmallSet<unsigned, 4> ImmDefRegs;
>>      DenseMap<unsigned, MachineInstr*> ImmDefMIs;
>>      SmallSet<unsigned, 16> FoldAsLoadDefCandidates;
>>
>>
>> _______________________________________________
>> 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