llvm
diff --git a/‎clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
Copy file name to clipboardExpand all lines: clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
+12-4 b/‎clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
Copy file name to clipboardExpand all lines: clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
+12-4
diff --git a/‎clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.h
Copy file name to clipboardExpand all lines: clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.h
+2 b/‎clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.h
Copy file name to clipboardExpand all lines: clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.h
+2
diff --git a/‎clang-tools-extra/test/clang-tidy/checkers/bugprone/narrowing-conversions-conditional-expressions.c
Copy file name to clipboard
+6 b/‎clang-tools-extra/test/clang-tidy/checkers/bugprone/narrowing-conversions-conditional-expressions.c
Copy file name to clipboard
+6
@@ -554,15 +554,23 @@ 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`.
-    handleBinaryOperator(Context, CO->getLHS()->getExprLoc(), Lhs,
-                         *CO->getLHS());
-    handleBinaryOperator(Context, CO->getRHS()->getExprLoc(), Lhs,
-                         *CO->getRHS());
+    handleConditionalOperatorArgument(Context, Lhs, CO->getLHS());
+    handleConditionalOperatorArgument(Context, 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())
 
@@ -85,6 +85,8 @@ 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);
 
 
@@ -0,0 +1,6 @@
+// RUN: %check_clang_tidy %s bugprone-narrowing-conversions %t -- --
+
+char test(int cond, char c) {
+	char ret = cond > 0 ? ':' : c;
+	return ret;
+}