getSizeOf: Handle long double (cppcheck-opensource#2888)

rikardfalkeborn · web-flow · commit 324e2675599d · 2020-11-11T22:51:17.000+01:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -948,6 +948,8 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings *settings)
         return settings->sizeof_float;
     if (vt.type == ValueType::Type::DOUBLE)
         return settings->sizeof_double;
+    if (vt.type == ValueType::Type::LONGDOUBLE)
+        return settings->sizeof_long_double;
 
     return 0;
 }
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -872,23 +872,28 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(4, values.back().intvalue);
 
-#define CHECK(A, B)                              \
+#define CHECK3(A, B, C)                          \
         do {                                     \
         code = "void f() {\n"                    \
                "    x = sizeof(" A ");\n"        \
                "}";                              \
-        values = tokenValues(code,"( " A " )");  \
+        values = tokenValues(code,"( " C " )");  \
         ASSERT_EQUALS(1U, values.size());        \
         ASSERT_EQUALS(B, values.back().intvalue);\
         } while(false)
+#define CHECK(A, B) CHECK3(A, B, A)
 
         // standard types
         CHECK("void *", settings.sizeof_pointer);
         CHECK("char", 1U);
         CHECK("short", settings.sizeof_short);
         CHECK("int", settings.sizeof_int);
         CHECK("long", settings.sizeof_long);
+        CHECK3("long long", settings.sizeof_long_long, "long");
         CHECK("wchar_t", settings.sizeof_wchar_t);
+        CHECK("float", settings.sizeof_float);
+        CHECK("double", settings.sizeof_double);
+        CHECK3("long double", settings.sizeof_long_double, "double");
 
         // string/char literals
         CHECK("\"asdf\"", 5);
@@ -903,6 +908,7 @@ class TestValueFlow : public TestFixture {
         CHECK("u'a'", 2U); // char16_t
         CHECK("U'a'", 4U); // char32_t
 #undef CHECK
+#undef CHECK3
 
         // array size
         code  = "void f() {\n"

Original file line number	Diff line number	Diff line change
`@@ -948,6 +948,8 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings *settings)`
`948`	`948`	`return settings->sizeof_float;`
`949`	`949`	`if (vt.type == ValueType::Type::DOUBLE)`
`950`	`950`	`return settings->sizeof_double;`
	`951`	`+ if (vt.type == ValueType::Type::LONGDOUBLE)`
	`952`	`+ return settings->sizeof_long_double;`
`951`	`953`
`952`	`954`	`return 0;`
`953`	`955`	`}`