Update klee

Author: ladisgin

build.sh

@@ -2,7 +2,7 @@
 set -e
 set -o pipefail
 pwd=$PWD
-chmod +x $pwd/submodules/klee/build.sh $pwd/submodules/Bear/build.sh $pwd/server/build.sh
-cd $pwd/submodules/klee && ./build.sh
+chmod +x $pwd/submodules/build-klee.sh $pwd/submodules/Bear/build.sh $pwd/server/build.sh
+cd $pwd/submodules && ./build-klee.sh
 cd $pwd/submodules/Bear && ./build.sh
 cd $pwd/server && ./build.sh

docs/contributor-guides/advanced/symbolic-stdin.md

@@ -249,7 +249,7 @@ TEST(regression, check_password_test_10)
 In the previous version, UnitTestBot didn't preprocess functions that were using `stdin` before sending the bitcode to 
 KLEE. Having added the interactive mode, we faced difficulties: KLEE couldn't work with multiple entry points 
 that used `stdin` in one launch. The fact is that KLEE substitutes the original entry point to POSIX wrapper, which 
-initializes environment and adds the `stdin`, `stdin-stat`, `stdin-read`, and `model-version` symbolic variables. 
+initializes environment and adds the `stdin`, `stdin_stat`, `stdin_read`, and `model_version` symbolic variables. 
 Then KLEE launches this wrapper as if the wrapper was the initial entry point.
 
 UnitTestBot doesn't use these KLEE wrappers now. Instead, UnitTestBot creates the POSIX wrapper for every 
@@ -304,4 +304,4 @@ TEST(regression, file_fgetc_test_1)
     int actual = file_fgetc(fA, fB, fC);
     EXPECT_EQ(4, actual);
 }
-```
+```

server/src/KleeRunner.cpp

@@ -222,7 +222,6 @@ KleeRunner::createKleeParams(const tests::TestMethod &testMethod,
         "--utbot",
         "--posix-runtime",
         "--skip-not-lazy-initialized",
-        "--type-system=CXX",
         "--fp-runtime",
         "--only-output-states-covering-new",
         "--allocate-determ",
@@ -235,9 +234,11 @@ KleeRunner::createKleeParams(const tests::TestMethod &testMethod,
         "--check-overshift=false",
         "--skip-not-symbolic-objects",
         "--use-tbaa",
+        "--ubsan-runtime",
         "--output-dir=" + kleeOut.string()
     };
     if (Paths::isCXXFile(testMethod.sourceFilePath)) {
+        argvData.emplace_back("--use-advanced-type-system=true");
         argvData.emplace_back("--libcxx=true");
     }
     if (settingsContext.useDeterministicSearcher) {

server/src/Tests.cpp

@@ -1063,12 +1063,12 @@ void KTestObjectParser::processGlobalParamPreValue(Tests::TestCaseDescription &t
 
 void KTestObjectParser::processSymbolicStdin(Tests::TestCaseDescription &testCaseDescription,
                                              const std::vector<RawKleeParam> &rawKleeParams) {
-    auto &&read = getKleeParamOrThrow(rawKleeParams, "stdin-read");
+    auto &&read = getKleeParamOrThrow(rawKleeParams, KleeUtils::STDIN_READ_NAME);
     std::string &&view =
-        testParameterView(read, { types::Type::longlongType(), "stdin-read" },
-                          types::PointerUsage::PARAMETER, testCaseDescription.objects,
-                          testCaseDescription.lazyReferences)
-            ->getEntryValue(nullptr);
+            testParameterView(read, {types::Type::longlongType(), KleeUtils::STDIN_READ_NAME},
+                              types::PointerUsage::PARAMETER, testCaseDescription.objects,
+                              testCaseDescription.lazyReferences)
+                    ->getEntryValue(nullptr);
     if (view == "0LL") {
         return;
     } else {
@@ -1078,7 +1078,7 @@ void KTestObjectParser::processSymbolicStdin(Tests::TestCaseDescription &testCas
             LOG_S(ERROR) << message;
             throw UnImplementedException(message);
         }
-        auto &&stdinBuffer = getKleeParamOrThrow(rawKleeParams, "stdin");
+        auto &&stdinBuffer = getKleeParamOrThrow(rawKleeParams, KleeUtils::STDIN_NAME);
         auto &&testParamView = stringLiteralView(stdinBuffer.rawData, usedStdinBytesCount);
         testCaseDescription.stdinValue = Tests::TestCaseParamValue(types::Type::getStdinParamName(),
                                                                    std::nullopt, testParamView);

server/src/utils/KleeUtils.h

@@ -12,6 +12,9 @@ namespace KleeUtils {
     static inline const std::string RESULT_VARIABLE_NAME = "utbot_result";
     static inline const std::string NOT_NULL_VARIABLE_NAME = "utbot_return_not_null";
 
+    static inline const std::string STDIN_READ_NAME = "stdin_read";
+    static inline const std::string STDIN_NAME = "stdin";
+
     std::string getRenamedOperator(std::string_view methodName);
 
     std::string entryPointFunction(const tests::Tests &tests,

server/src/utils/PrinterUtils.cpp

@@ -161,15 +161,15 @@ namespace PrinterUtils {
     }
 
     std::string getFileParamKTestJSON(char fileName) {
-        return StringUtils::stringFormat("%c-data", fileName);
+        return StringUtils::stringFormat("%c_data", fileName);
     }
 
     std::string getFileReadBytesParamKTestJSON(char fileName) {
-        return StringUtils::stringFormat("%c-data-read", fileName);
+        return StringUtils::stringFormat("%c_data_read", fileName);
     }
 
     std::string getFileWriteBytesParamKTestJSON(char fileName) {
-        return StringUtils::stringFormat("%c-data-write", fileName);
+        return StringUtils::stringFormat("%c_data_write", fileName);
     }
 
     void removeThreadLocalQualifiers(std::string &decl) {

submodules/build-klee.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# This script is used to build KLEE as UTBot backend
+
+set -e
+set -o pipefail
+cd klee
+mkdir -p build
+cd build
+
+$UTBOT_CMAKE_BINARY -G Ninja \
+  -DCMAKE_PREFIX_PATH=$UTBOT_INSTALL_DIR/lib/cmake/z3 \
+  -DCMAKE_LIBRARY_PATH=$UTBOT_INSTALL_DIR/lib \
+  -DCMAKE_INCLUDE_PATH=$UTBOT_INSTALL_DIR/include \
+  -DENABLE_SOLVER_Z3=TRUE \
+  -DENABLE_POSIX_RUNTIME=TRUE \
+  -DENABLE_FLOATING_POINT=TRUE \
+  -DENABLE_FP_RUNTIME=TRUE \
+  -DLLVM_CONFIG_BINARY=$UTBOT_INSTALL_DIR/bin/llvm-config \
+  -DLLVMCC=/utbot_distr/install/bin/clang \
+  -DLLVMCXX=/utbot_distr/install/bin/clang++ \
+  -DENABLE_UNIT_TESTS=TRUE \
+  -DENABLE_SYSTEM_TESTS=TRUE \
+  -DGTEST_SRC_DIR=$UTBOT_ALL/gtest \
+  -DGTEST_INCLUDE_DIR=$UTBOT_ALL/gtest/googletest/include \
+  -DCMAKE_INSTALL_PREFIX=$UTBOT_ALL/klee \
+  -DENABLE_KLEE_LIBCXX=TRUE \
+  -DKLEE_LIBCXX_DIR=$UTBOT_ALL/libcxx/install \
+  -DKLEE_LIBCXX_INCLUDE_DIR=$UTBOT_ALL/libcxx/install/include/c++/v1 \
+  -DENABLE_KLEE_EH_CXX=TRUE \
+  -DKLEE_LIBCXXABI_SRC_DIR=$UTBOT_ALL/libcxx/libcxxabi \
+  -DCMAKE_BUILD_TYPE=Release \
+  ..
+
+$UTBOT_CMAKE_BINARY --build .
+$UTBOT_CMAKE_BINARY --install .