[cfe-commits] r139326 - in /cfe/trunk: lib/Sema/SemaChecking.cpp test/SemaCXX/warn-literal-conversion.cpp

[Matt Beaumont-Gay]

Author: matthewbg
Date: Thu Sep  8 17:30:47 2011
New Revision: 139326

URL: http://llvm.org/viewvc/llvm-project?rev=139326&view=rev
Log:
Extend -Wliteral-conversion to catch "int i = -1.234"

Modified:
    cfe/trunk/lib/Sema/SemaChecking.cpp
    cfe/trunk/test/SemaCXX/warn-literal-conversion.cpp

Modified: cfe/trunk/lib/Sema/SemaChecking.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=139326&r1=139325&r2=139326&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaChecking.cpp (original)
+++ cfe/trunk/lib/Sema/SemaChecking.cpp Thu Sep  8 17:30:47 2011
@@ -3287,6 +3287,11 @@
         return;
       
       Expr *InnerE = E->IgnoreParenImpCasts();
+      // We also want to warn on, e.g., "int i = -1.234"
+      if (UnaryOperator *UOp = dyn_cast<UnaryOperator>(InnerE))
+        if (UOp->getOpcode() == UO_Minus || UOp->getOpcode() == UO_Plus)
+          InnerE = UOp->getSubExpr()->IgnoreParenImpCasts();
+
       if (FloatingLiteral *FL = dyn_cast<FloatingLiteral>(InnerE)) {
         DiagnoseFloatingLiteralImpCast(S, FL, T, CC);
       } else {

Modified: cfe/trunk/test/SemaCXX/warn-literal-conversion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-literal-conversion.cpp?rev=139326&r1=139325&r2=139326&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-literal-conversion.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-literal-conversion.cpp Thu Sep  8 17:30:47 2011
@@ -30,8 +30,7 @@
   // Test passing a literal floating-point value to a function that takes an integer.
   foo(1.2F); // expected-warning {{implicit conversion turns literal floating-point number into integer}}
 
-  // FIXME: -Wconversion-literal doesn't catch "-1.2F".
-  int y10 = -1.2F;
+  int y10 = -1.2F;  // expected-warning {{implicit conversion turns literal floating-point number into integer}}
 
   // -Wconversion-literal does NOT catch const values.
   // (-Wconversion DOES catch them.)