Commit ad7d8347 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r227628: 

------------------------------------------------------------------------
r227628 | lhames | 2015-01-30 14:28:49 -0800 (Fri, 30 Jan 2015) | 6 lines

[PBQP] Fix transposed worst row/column check in handleAdd/RemoveNode in the PBQP
allocator.

Patch by Jonas Paulsson. Thanks Jonas!


------------------------------------------------------------------------

llvm-svn: 228501
parent 00ba96ec

llvm/include/llvm/CodeGen/RegAllocPBQP.h

+2 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ public: 
  void setReductionState(ReductionState RS) { this->RS = RS; }



  void handleAddEdge(const MatrixMetadata& MD, bool Transpose) {

    DeniedOpts += Transpose ? MD.getWorstCol() : MD.getWorstRow();

    DeniedOpts += Transpose ? MD.getWorstRow() : MD.getWorstCol();

    const bool* UnsafeOpts =

      Transpose ? MD.getUnsafeCols() : MD.getUnsafeRows();

    for (unsigned i = 0; i < NumOpts; ++i)
@@ -256,7 +256,7 @@ public: 
  }



  void handleRemoveEdge(const MatrixMetadata& MD, bool Transpose) {

    DeniedOpts -= Transpose ? MD.getWorstCol() : MD.getWorstRow();

    DeniedOpts -= Transpose ? MD.getWorstRow() : MD.getWorstCol();

    const bool* UnsafeOpts =

      Transpose ? MD.getUnsafeCols() : MD.getUnsafeRows();

    for (unsigned i = 0; i < NumOpts; ++i)