Merge branch 'main' into check-mutexes

cfg/cppunit.cfg

@@ -5,13 +5,13 @@
   <define name="CPPUNIT_TEST(test)" value=""/>
   <define name="CPPUNIT_TEST_SUITE_END()" value=""/>
   <!-- Macros see http://cppunit.sourceforge.net/doc/cvs/group___assertions.html  -->
-  <define name="CPPUNIT_ASSERT(condition)" value=""/>
+  <define name="CPPUNIT_ASSERT(condition)" value="if (!(condition)) throw false;"/>
-  <define name="CPPUNIT_ASSERT_MESSAGE(message, condition)" value=""/>
+  <define name="CPPUNIT_ASSERT_MESSAGE(message, condition)" value="if (!(condition)) throw message;"/>
-  <define name="CPPUNIT_FAIL(message)" value=""/>
+  <define name="CPPUNIT_FAIL(message)" value="throw message;"/>
-  <define name="CPPUNIT_ASSERT_EQUAL(expected, actual)" value=""/>
+  <define name="CPPUNIT_ASSERT_EQUAL(expected, actual)" value="if (expected != actual) throw false;"/>
-  <define name="CPPUNIT_ASSERT_EQUAL_MESSAGE(message, expected, actual)" value=""/>
+  <define name="CPPUNIT_ASSERT_EQUAL_MESSAGE(message, expected, actual)" value="if (expected != actual) throw message;"/>
-  <define name="CPPUNIT_ASSERT_DOUBLES_EQUAL(expected, actual, delta)" value=""/>
+  <define name="CPPUNIT_ASSERT_DOUBLES_EQUAL(expected, actual, delta)" value="if (std::abs((expected) - (actual)) &gt; delta) throw false;"/>
-  <define name="CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(message, expected, actual, delta)" value=""/>
+  <define name="CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(message, expected, actual, delta)" value="if (std::abs((expected) - (actual)) &gt; delta) throw message;"/>
   <define name="CPPUNIT_ASSERT_THROW(expression, ExceptionType)" value=""/>
   <define name="CPPUNIT_ASSERT_THROW_MESSAGE(message, expression, ExceptionType)" value=""/>
   <define name="CPPUNIT_ASSERT_NO_THROW(expression)" value=""/>

lib/CMakeLists.txt

@@ -37,7 +37,13 @@ else()
 endif()
 
 add_library(lib_objs OBJECT ${srcs_lib} ${hdrs})
+if (CMAKE_VERSION VERSION_EQUAL "3.16" OR CMAKE_VERSION VERSION_GREATER "3.16")
+    target_precompile_headers(lib_objs PRIVATE precompiled.h)
+endif()
 if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_library(lib_objs_sanitized OBJECT EXCLUDE_FROM_ALL ${srcs_lib} ${hdrs})
     target_compile_options(lib_objs_sanitized PRIVATE -fsanitize=address)
+    if (CMAKE_VERSION VERSION_EQUAL "3.16" OR CMAKE_VERSION VERSION_GREATER "3.16")
+        target_precompile_headers(lib_objs_sanitized PRIVATE precompiled.h)
+    endif()
 endif()

lib/exprengine.cpp

@@ -204,7 +204,6 @@ namespace {
                 return;
             mSymbols.insert(symbolicExpression);
             mMap[tok].push_back(symbolicExpression + "=" + value->getRange());
-
         }
 
         void state(const Token *tok, const std::string &s) {
@@ -342,7 +341,8 @@ namespace {
             mTrackExecution->symbolRange(tok, value);
             if (value) {
                 if (auto arr = std::dynamic_pointer_cast<ExprEngine::ArrayValue>(value)) {
-                    mTrackExecution->symbolRange(tok, arr->size);
+                    for (const auto &dim: arr->size)
+                        mTrackExecution->symbolRange(tok, dim);
                     for (const auto &indexAndValue: arr->data)
                         mTrackExecution->symbolRange(tok, indexAndValue.value);
                 } else if (auto s = std::dynamic_pointer_cast<ExprEngine::StructValue>(value)) {
@@ -564,8 +564,8 @@ static int128_t truncateInt(int128_t value, int bits, char sign)
 ExprEngine::ArrayValue::ArrayValue(const std::string &name, ExprEngine::ValuePtr size, ExprEngine::ValuePtr value, bool pointer, bool nullPointer, bool uninitPointer)
     : Value(name, ExprEngine::ValueType::ArrayValue)
     , pointer(pointer), nullPointer(nullPointer), uninitPointer(uninitPointer)
-    , size(size)
 {
+    this->size.push_back(size);
     assign(ExprEngine::ValuePtr(), value);
 }
 
@@ -574,17 +574,16 @@ ExprEngine::ArrayValue::ArrayValue(DataBase *data, const Variable *var)
     , pointer(var->isPointer()), nullPointer(var->isPointer()), uninitPointer(var->isPointer())
 {
     if (var) {
-        int sz = 1;
         for (const auto &dim : var->dimensions()) {
-            if (!dim.known) {
+            if (dim.known)
-                sz = -1;
+                size.push_back(std::make_shared<ExprEngine::IntRange>(std::to_string(dim.num), dim.num, dim.num));
-                break;
+            else
+                size.push_back(std::make_shared<ExprEngine::IntRange>(data->getNewSymbolName(), 1, ExprEngine::ArrayValue::MAXSIZE));
         }
-            sz *= dim.num;
+    } else {
-        }
+        size.push_back(std::make_shared<ExprEngine::IntRange>(data->getNewSymbolName(), 1, ExprEngine::ArrayValue::MAXSIZE));
-        if (sz >= 1)
-            size = std::make_shared<ExprEngine::IntRange>(std::to_string(sz), sz, sz);
     }
+
     ValuePtr val;
     if (var && !var->isGlobal() && !var->isStatic())
         val = std::make_shared<ExprEngine::UninitValue>();
@@ -727,7 +726,12 @@ std::string ExprEngine::ConditionalValue::getSymbolicExpression() const
 std::string ExprEngine::ArrayValue::getSymbolicExpression() const
 {
     std::ostringstream ostr;
-    ostr << "size=" << (size ? size->name : std::string("(null)"));
+    if (size.empty())
+        ostr << "(null)";
+    else {
+        for (const auto &dim: size)
+            ostr << "[" << (dim ? dim->name : std::string("(null)")) << "]";
+    }
     for (const auto &indexAndValue : data) {
         ostr << ",["
              << (!indexAndValue.index ? std::string(":") : indexAndValue.index->name)
@@ -1252,6 +1256,47 @@ static void call(const std::vector<ExprEngine::Callback> &callbacks, const Token
 static ExprEngine::ValuePtr executeExpression(const Token *tok, Data &data);
 static ExprEngine::ValuePtr executeExpression1(const Token *tok, Data &data);
 
+static ExprEngine::ValuePtr calculateArrayIndex(const Token *tok, Data &data, const ExprEngine::ArrayValue &arrayValue)
+{
+    int nr = 1;
+    const Token *tok2 = tok;
+    while (Token::simpleMatch(tok2->astOperand1(), "[")) {
+        tok2 = tok2->astOperand1();
+        nr++;
+    }
+
+    ExprEngine::ValuePtr totalIndex;
+    ExprEngine::ValuePtr dim;
+    while (Token::simpleMatch(tok, "[")) {
+        auto rawIndex = executeExpression(tok->astOperand2(), data);
+
+        ExprEngine::ValuePtr index;
+        if (dim)
+            index = simplifyValue(std::make_shared<ExprEngine::BinOpResult>("*", dim, rawIndex));
+        else
+            index = rawIndex;
+
+        if (!totalIndex)
+            totalIndex = index;
+        else
+            totalIndex = simplifyValue(std::make_shared<ExprEngine::BinOpResult>("+", index, totalIndex));
+
+        if (arrayValue.size.size() >= nr) {
+            if (arrayValue.size[nr-1]) {
+                if (!dim)
+                    dim = arrayValue.size[nr-1];
+                else
+                    dim = simplifyValue(std::make_shared<ExprEngine::BinOpResult>("*", dim, arrayValue.size[nr-1]));
+            }
+        }
+
+        nr--;
+        tok = tok->astOperand1();
+    }
+
+    return totalIndex;
+}
+
 static ExprEngine::ValuePtr executeReturn(const Token *tok, Data &data)
 {
     ExprEngine::ValuePtr retval = executeExpression(tok->astOperand1(), data);
@@ -1334,15 +1379,18 @@ static ExprEngine::ValuePtr executeAssign(const Token *tok, Data &data)
     if (lhsToken->varId() > 0) {
         data.assignValue(lhsToken, lhsToken->varId(), assignValue);
     } else if (lhsToken->str() == "[") {
-        auto arrayValue = data.getArrayValue(lhsToken->astOperand1());
+        const Token *tok2 = lhsToken;
+        while (Token::simpleMatch(tok2->astOperand1(), "["))
+            tok2 = tok2->astOperand1();
+        auto arrayValue = data.getArrayValue(tok2->astOperand1());
         if (arrayValue) {
             // Is it array initialization?
-            const Token *arrayInit = lhsToken->astOperand1();
+            const Token *arrayInit = tok2->astOperand1();
             if (arrayInit && arrayInit->variable() && arrayInit->variable()->nameToken() == arrayInit) {
                 if (assignValue->type == ExprEngine::ValueType::StringLiteralValue)
                     arrayValue->assign(ExprEngine::ValuePtr(), assignValue);
             } else {
-                auto indexValue = executeExpression(lhsToken->astOperand2(), data);
+                auto indexValue = calculateArrayIndex(lhsToken, data, *arrayValue);
                 arrayValue->assign(indexValue, assignValue);
             }
         }
@@ -1511,9 +1559,12 @@ static ExprEngine::ValuePtr executeFunctionCall(const Token *tok, Data &data)
 
 static ExprEngine::ValuePtr executeArrayIndex(const Token *tok, Data &data)
 {
-    auto arrayValue = data.getArrayValue(tok->astOperand1());
+    const Token *tok2 = tok;
+    while (Token::simpleMatch(tok2->astOperand1(), "["))
+        tok2 = tok2->astOperand1();
+    auto arrayValue = data.getArrayValue(tok2->astOperand1());
     if (arrayValue) {
-        auto indexValue = executeExpression(tok->astOperand2(), data);
+        auto indexValue = calculateArrayIndex(tok, data, *arrayValue);
         auto conditionalValues = arrayValue->read(indexValue);
         for (auto value: conditionalValues)
             call(data.callbacks, tok, value.second, &data);

lib/exprengine.h

@@ -204,7 +204,7 @@ namespace ExprEngine {
             ValuePtr value;
         };
         std::vector<IndexAndValue> data;
-        ValuePtr size;
+        std::vector<ValuePtr> size;
     };
 
     class StringLiteralValue: public Value {

lib/templatesimplifier.cpp

@@ -1986,6 +1986,9 @@ void TemplateSimplifier::expandTemplate(
                         } else if (typeindentlevel > 0 && typetok->str() == ">" && brackets1.top()->str() == "<") {
                             --typeindentlevel;
                             brackets1.pop();
+                        } else if (Token::Match(typetok, "const_cast|dynamic_cast|reinterpret_cast|static_cast <")) {
+                            brackets1.push(typetok->next());
+                            ++typeindentlevel;
                         } else if (typetok->str() == "(")
                             ++typeindentlevel;
                         else if (typetok->str() == ")")

test/CMakeLists.txt

@@ -27,6 +27,10 @@ if (BUILD_TESTS)
         target_link_libraries(testrunner ${Z3_LIBRARIES})
     endif()
 
+    if (CMAKE_VERSION VERSION_EQUAL "3.16" OR CMAKE_VERSION VERSION_GREATER "3.16")
+        target_precompile_headers(testrunner PRIVATE precompiled.h)
+    endif()
+
     add_custom_target(copy_cfg ALL
         COMMENT "Copying cfg files")
     add_custom_command(

test/testexprengine.cpp

@@ -70,6 +70,7 @@ private:
         TEST_CASE(array2);
         TEST_CASE(array3);
         TEST_CASE(array4);
+        TEST_CASE(array5);
         TEST_CASE(arrayInit1);
         TEST_CASE(arrayInit2);
         TEST_CASE(arrayUninit);
@@ -509,7 +510,20 @@ private:
                             "void f() { int x = buf[0]; }";
         ASSERT_EQUALS("2:16: $2:0=-2147483648:2147483647\n"
                       "2:20: $2=-2147483648:2147483647\n"
-                      "2:26: { buf=($1,size=10,[:]=$2) x=$2:0}\n",
+                      "2:26: { buf=($1,[10],[:]=$2) x=$2:0}\n",
+                      trackExecution(code));
+    }
+
+    void array5() {
+        const char code[] = "int f(int x) {\n"
+                            "  int buf[3][4][5];\n"
+                            "  buf[x][1][2] = 10;\n"
+                            "  return buf[0][1][2];\n"
+                            "}";
+        ASSERT_EQUALS("1:14: $1=-2147483648:2147483647\n"
+                      "1:14: { x=$1}\n"
+                      "2:19: { x=$1 buf=($2,[3][4][5],[:]=?)}\n"
+                      "3:20: { x=$1 buf=($2,[3][4][5],[:]=?,[((20)*($1))+(7)]=10)}\n",
                       trackExecution(code));
     }
 
@@ -531,7 +545,7 @@ private:
                             "  for (int i = 0; i < 3; i++) arr[i][0] = arr[1][2];\n"
                             "  return arr[0][0];"
                             "}";
-        ASSERT_EQUALS("?", getRange(code, "arr[1]"));
+        ASSERT_EQUALS("?", getRange(code, "arr[1][2]"));
     }
 
 
@@ -601,7 +615,7 @@ private:
 
     void pointer1() {
         const char code[] = "void f(unsigned char *p) { return *p == 7; }";
-        ASSERT_EQUALS("size=$1,[:]=?,null", getRange(code, "p"));
+        ASSERT_EQUALS("[$1],[:]=?,null", getRange(code, "p"));
         ASSERT_EQUALS("(and (>= $3 0) (<= $3 255))\n"
                       "(= $3 7)\n"
                       "z3::sat\n",

test/testsimplifytemplate.cpp

@@ -256,6 +256,8 @@ private:
         TEST_CASE(template_variable_4);
 
         TEST_CASE(simplifyDecltype);
+
+        TEST_CASE(castInExpansion);
     }
 
     std::string tok(const char code[], bool debugwarnings = false, Settings::PlatformType type = Settings::Native) {
@@ -5129,6 +5131,21 @@ private:
                                 "class type<longdouble> { } ;";
         ASSERT_EQUALS(expected, tok(code));
     }
+
+    void castInExpansion() {
+        const char code[] = "template <int N> class C { };\n"
+                            "template <typename TC> class Base {};\n"
+                            "template <typename TC> class Derived : private Base<TC> {};\n"
+                            "typedef Derived<C<static_cast<int>(-1)> > C_;\n"
+                            "class C3 { C_ c; };";
+        const char expected[] = "template < int N > class C { } ; "
+                                "class Base<C<static_cast<int>-1>> ; "
+                                "class Derived<C<static_cast<int>-1>> ; "
+                                "class C3 { Derived<C<static_cast<int>-1>> c ; } ; "
+                                "class Derived<C<static_cast<int>-1>> : private Base<C<static_cast<int>-1>> { } ; "
+                                "class Base<C<static_cast<int>-1>> { } ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
 };
 
 REGISTER_TEST(TestSimplifyTemplate)

tools/donate_cpu_lib.py

@@ -43,7 +43,7 @@ def get_cppcheck(cppcheck_path, work_path):
                 os.chdir(cppcheck_path)
                 try:
                     subprocess.check_call(['git', 'checkout', '-f', 'main'])
-                except CalledProcessError:
+                except subprocess.CalledProcessError:
                     subprocess.check_call(['git', 'checkout', '-f', 'master'])
                     subprocess.check_call(['git', 'pull'])
                     subprocess.check_call(['git', 'checkout', 'origin/main', '-b', 'main'])