Merge branch 'main' into chr_14395

Author: chrchr-github

cfg/std.cfg

@@ -3,16 +3,16 @@
   <!-- stdint.h -->
   <define name="INT8_MIN" value="-128"/>
   <define name="INT16_MIN" value="-32768"/>
-  <define name="INT32_MIN" value="-2147483648"/>
-  <define name="INT64_MIN" value="-9223372036854775808"/>
+  <define name="INT32_MIN" value="(-2147483647-1)"/>
+  <define name="INT64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_FAST8_MIN" value="-128"/>
-  <define name="INT_FAST16_MIN" value="-9223372036854775808"/>
-  <define name="INT_FAST32_MIN" value="-9223372036854775808"/>
-  <define name="INT_FAST64_MIN" value="-9223372036854775808"/>
+  <define name="INT_FAST16_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST32_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_LEAST8_MIN" value="-128"/>
   <define name="INT_LEAST16_MIN" value="-32768"/>
-  <define name="INT_LEAST32_MIN" value="-2147483648"/>
-  <define name="INT_LEAST64_MIN" value="-9223372036854775808"/>
+  <define name="INT_LEAST32_MIN" value="(-2147483647-1)"/>
+  <define name="INT_LEAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT8_MAX" value="127"/>
   <define name="INT16_MAX" value="32767"/>
   <define name="INT32_MAX" value="2147483647"/>

lib/tokenize.cpp

@@ -110,7 +110,7 @@ static bool isClassStructUnionEnumStart(const Token * tok)
     const Token * tok2 = tok->previous();
     while (tok2 && !Token::Match(tok2, "class|struct|union|enum|{|}|)|;|>|>>"))
         tok2 = tok2->previous();
-    return Token::Match(tok2, "class|struct|union|enum");
+    return Token::Match(tok2, "class|struct|union|enum") && !Token::simpleMatch(tok2->tokAt(-1), "->");
 }
 
 //---------------------------------------------------------------------------

test/cfg/std.c

@@ -38,6 +38,17 @@
 #include <math.h>
 #include <stddef.h>
 
+void test_int32_min() {
+    // cppcheck-suppress shiftNegativeLHS
+    // cppcheck-suppress shiftTooManyBits ; tests that INT32_MIN is a 32-bit expression (not 64-bit expression)
+    (void)(INT32_MIN >> 40);
+}
+
+void test_int64_min() {
+    // cppcheck-suppress compareValueOutOfTypeRangeError ; tests that INT64_MIN is a signed expression
+    if (INT64_MIN < 0) {}
+}
+
 size_t invalidFunctionArgStr_wcslen(void)
 {
     const wchar_t terminated0[] = L"ABCDEF49620910";

test/testtokenize.cpp

@@ -7683,6 +7683,12 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_NO_THROW(tokenizeAndStringify("struct S { unsigned u:2, :30; };")); // #14393
 
+        ASSERT_NO_THROW(tokenizeAndStringify("struct S {};\n" // #14400
+                                             "auto f(bool b) -> struct S {\n"
+                                             "    if (b) {}\n"
+                                             "    return {};\n"
+                                             "};\n"));
+      
         ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #14395
                                              "    for (int i : [](int a, int b) { ++a; ++b; return std::vector<int>{a, b}; }(1, 2)) {}\n"
                                              "}\n"));