Revert "[clang-tidy] fix bugprone-narrowing-conversions false positive for conditional expression" (#151859)

Reverts #139474 due to lit test failures on `arm`
platforms.

Author: vbvictor

clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp

@@ -555,22 +555,15 @@ bool NarrowingConversionsCheck::handleConditionalOperator(
     // We have an expression like so: `output = cond ? lhs : rhs`
     // From the point of view of narrowing conversion we treat it as two
     // expressions `output = lhs` and `output = rhs`.
-    handleConditionalOperatorArgument(Context, Lhs, CO->getLHS());
-    handleConditionalOperatorArgument(Context, Lhs, CO->getRHS());
+    handleBinaryOperator(Context, CO->getLHS()->getExprLoc(), Lhs,
+                         *CO->getLHS());
+    handleBinaryOperator(Context, CO->getRHS()->getExprLoc(), Lhs,
+                         *CO->getRHS());
     return true;
   }
   return false;
 }
 
-void NarrowingConversionsCheck::handleConditionalOperatorArgument(
-    const ASTContext &Context, const Expr &Lhs, const Expr *Arg) {
-  if (const auto *ICE = llvm::dyn_cast<ImplicitCastExpr>(Arg))
-    if (!Arg->getIntegerConstantExpr(Context))
-      Arg = ICE->getSubExpr();
-
-  handleBinaryOperator(Context, Arg->getExprLoc(), Lhs, *Arg);
-}
-
 void NarrowingConversionsCheck::handleImplicitCast(
     const ASTContext &Context, const ImplicitCastExpr &Cast) {
   if (Cast.getExprLoc().isMacroID())

clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.h

@@ -85,8 +85,6 @@ class NarrowingConversionsCheck : public ClangTidyCheck {
   bool handleConditionalOperator(const ASTContext &Context, const Expr &Lhs,
                                  const Expr &Rhs);
 
-  void handleConditionalOperatorArgument(const ASTContext &Context,
-                                         const Expr &Lhs, const Expr *Arg);
   void handleImplicitCast(const ASTContext &Context,
                           const ImplicitCastExpr &Cast);
 

clang-tools-extra/docs/ReleaseNotes.rst

@@ -134,10 +134,6 @@ Changes in existing checks
   <clang-tidy/checks/bugprone/infinite-loop>` check by adding detection for
   variables introduced by structured bindings.
 
-- Improved :doc:`bugprone-narrowing-conversions
-  <clang-tidy/checks/bugprone/narrowing-conversions>` check by fixing
-  false positive from analysis of a conditional expression in C.
-
 - Improved :doc:`bugprone-reserved-identifier
   <clang-tidy/checks/bugprone/reserved-identifier>` check by ignoring
   declarations in system headers.