[CT] Clean up, for rebase

Author: wizardengineer

clang/lib/Sema/SemaChecking.cpp

@@ -3528,7 +3528,7 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
         if ((AIsInteger && BIsInteger) || (AIsFloating && BIsFloating)) {
           // Both are in the same category, allow usual arithmetic conversions
           ResultTy = UsualArithmeticConversions(
-              ARes, BRes, TheCall->getBeginLoc(), ACK_Conditional);
+              ARes, BRes, TheCall->getBeginLoc(), ArithConvKind::Conditional);
           if (ARes.isInvalid() || BRes.isInvalid() || ResultTy.isNull()) {
             return Diag(A->getBeginLoc(),
                         diag::err_typecheck_cond_incompatible_operands)

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

@@ -4119,9 +4119,6 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
   unsigned BitWidth = VT.getScalarSizeInBits();
   SDLoc DL(N);
 
-  if (N->getFlags().hasNoCtSelectOpt())
-    return SDValue();
-
   if (SDValue V = foldSubCtlzNot<EmptyMatchContext>(N, DAG))
     return V;