XXX: Rebase fix

1 files changed, 0 insertions, 17 deletions

diff --git a/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp b/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp
index 09cc9a6fa34..73b87b082e2 100644
--- a/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp
+++ b/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp
@@ -560,23 +560,6 @@ SDNode *AMDGPUDAGToDAGISel::Select(SDNode *N) {
   case AMDGPUISD::DIV_SCALE: {
     return SelectDIV_SCALE(N);
   }
-  case AMDGPUISD::BRCOND_UNIFORM: {
-    SDValue Cond = N->getOperand(0);
-
-    // Let TableGen handle this case:
-//    if (!Cond.getOpcode() == ISD::SETCC)
-//      break;
-
-    const SDValue Ops[] = {
-      N->getOperand(1),
-      N->getOperand(2)
-    };
-
-    return CurDAG->getMachineNode(AMDGPU::S_CBRANCH_SCC1, SDLoc(N),
-                                  MVT::Other, Ops);
-    break;
-
-  }
   case ISD::CopyToReg: {
     const SITargetLowering& Lowering =
       *static_cast<const SITargetLowering*>(getTargetLowering());