]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Pull in r191165 from upstream llvm trunk:
authordim <dim@FreeBSD.org>
Sun, 22 Sep 2013 22:03:30 +0000 (22:03 +0000)
committerdim <dim@FreeBSD.org>
Sun, 22 Sep 2013 22:03:30 +0000 (22:03 +0000)
commit340e2ed8dbe5580459203833def634c2888db571
tree9ef0a3c80a9134650d8a3b0ca89909b73f1656a2
parent733c348ff3f536b89b2147621a7fd3d9ed16640e
Pull in r191165 from upstream llvm trunk:

  ISelDAG: spot chain cycles involving MachineNodes

  Previously, the DAGISel function WalkChainUsers was spotting that it
  had entered already-selected territory by whether a node was a
  MachineNode (amongst other things). Since it's fairly common practice
  to insert MachineNodes during ISelLowering, this was not the correct
  check.

  Looking around, it seems that other nodes get their NodeId set to -1
  upon selection, so this makes sure the same thing happens to all
  MachineNodes and uses that characteristic to determine whether we
  should stop looking for a loop during selection.

  This should fix PR15840.

Specifically, this fixes the long-standing assertion failure when
compiling the multimedia/gstreamer port on i386.  Thanks to Tijl
Coosemans for his help in getting upstream to fix it.

Approved by: re (marius)
12 files changed:
contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp
contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp
contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp
contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp