loplugin:intvsfloat get this working reliably

Change-Id: Ifdf1a152f6bc2e2f6edae97a5191120f630f7e49
Reviewed-on: https://gerrit.libreoffice.org/64374
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

compilerplugins/clang/store/intvsfloat.cxx → compilerplugins/clang/intvsfloat.cxx

@@ -16,9 +16,7 @@
 
 TODO multiplying/otherop on a combination of a float and int, and then truncating to int. like this:
     float getRotation() {}
-    int moRotation;
-    moRotation = -F_PI180 * 90 * getRotation();
-
+    int moRotation = -F_PI180 * 90 * getRotation();
 */
 namespace
 {
@@ -90,6 +88,8 @@ llvm::Optional<double> IntVsFloat::getExprValue(Expr const* expr)
     // Of the available clang Evaluate* APIs, this is the __only__ one that produces useful output
     // (as of 17 Aug 2018 checkout of clang, ie. towards clang 7)
 
+    if (expr->isValueDependent())
+        return llvm::Optional<double>();
     Expr::EvalResult evalResult;
     if (!expr->EvaluateAsRValue(evalResult, compiler.getASTContext()))
         return llvm::Optional<double>();

compilerplugins/clang/test/intvsfloat.cxx

@@ -18,26 +18,22 @@ struct Class1
 
 void func1(Class1 const& class1)
 {
-    if (1
-        == PI) // expected-error {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    // expected-error@+1 {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    if (1 == PI)
         return;
-    if (1
-        == class1
-               .PI) // expected-error {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    // expected-error@+1 {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    if (1 == class1.PI)
         return;
-    if (true
-        == class1
-               .PI) // expected-error {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    // expected-error@+1 {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    if (true == class1.PI)
         return;
     if (1 == class1.getInt()) // no warning expected
         return;
-    if (1
-        == class1
-               .E()) // expected-error {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    // expected-error@+1 {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    if (1 == class1.E())
         return;
-    if (true
-        == class1
-               .E()) // expected-error {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    // expected-error@+1 {{comparing integer to float constant, can never be true [loplugin:intvsfloat]}}
+    if (true == class1.E())
         return;
     if (1 == class1.getFloat()) // no warning expected
         return;
@@ -45,24 +41,21 @@ void func1(Class1 const& class1)
 
 void func2(Class1 const& class1)
 {
-    int i0
-        = PI; // expected-error {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    // expected-error@+1 {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    int i0 = PI;
     (void)i0;
-    int i1
-        = class1
-              .PI; // expected-error {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    // expected-error@+1 {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    int i1 = class1.PI;
     (void)i1;
-    int i2
-        = class1
-              .E(); // expected-error {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    // expected-error@+1 {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    int i2 = class1.E();
     (void)i2;
     int i3 = class1.getFloat(); // no warning expected
     (void)i3;
     int i4 = class1.getInt(); // no warning expected
     (void)i4;
-    bool b1
-        = class1
-              .E(); // expected-error {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    // expected-error@+1 {{assigning constant float value to int truncates data [loplugin:intvsfloat]}}
+    bool b1 = class1.E();
     (void)b1;
 }
 

sc/source/ui/app/inputwin.cxx

@@ -677,7 +677,7 @@ void ScInputWindow::MouseMove( const MouseEvent& rMEvt )
     if (bInResize)
     {
         // detect direction
-        long nResizeThreshold = (long(TBX_WINDOW_HEIGHT) * 0.7);
+        long nResizeThreshold = long(TBX_WINDOW_HEIGHT * 0.7);
         bool bResetPointerPos = false;
 
         // Detect attempt to expand toolbar too much

solenv/CompilerTest_compilerplugins_clang.mk

@@ -28,6 +28,7 @@ $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
     compilerplugins/clang/test/emptyif \
     compilerplugins/clang/test/externvar \
     compilerplugins/clang/test/expressionalwayszero \
+    compilerplugins/clang/test/intvsfloat \
     compilerplugins/clang/test/faileddyncast \
     compilerplugins/clang/test/finalprotected \
     compilerplugins/clang/test/flatten \

vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx

@@ -1148,7 +1148,7 @@ void GtkSalGraphics::PaintSpinButton(GtkStateFlags flags,
     }
 }
 
-#define FALLBACK_ARROW_SIZE 11 * 0.85
+#define FALLBACK_ARROW_SIZE gint(11 * 0.85)
 
 tools::Rectangle GtkSalGraphics::NWGetComboBoxButtonRect(
                                                    ControlPart nPart,