Merge branch 'development' into f-RemovePlugins

Author: Martin Mory

cmake/phasar_macros.cmake

@@ -76,7 +76,7 @@ function(generate_ll_file)
   set(test_code_file_target "${parent_dir}_${test_code_file_name}${ll_file_suffix}")
 
   # define compilation flags
-  set(GEN_CXX_FLAGS -std=c++14 -fno-discard-value-names -emit-llvm -S)
+  set(GEN_CXX_FLAGS -std=c++17 -fno-discard-value-names -emit-llvm -S)
   set(GEN_C_FLAGS -fno-discard-value-names -emit-llvm -S)
   set(GEN_CMD_COMMENT "[LL]")
   if(GEN_LL_MEM2REG)

unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCATest.cpp

@@ -138,7 +138,7 @@ TEST_F(IDEGeneralizedLCATest, StringTestCpp) {
   const auto *LastMainInstruction =
       getLastInstructionOf(IRDB->getFunction("main"));
   GroundTruth.push_back({{EdgeValue("Hello, World")},
-                         2,
+                         3,
                          std::stoi(getMetaDataID(LastMainInstruction))});
   compareResults(GroundTruth);
 }

unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp

@@ -643,10 +643,10 @@ PHASAR_SKIP_TEST(TEST_F(IDEInstInteractionAnalysisTest, HandleRVOTest_01) {
           "main", 16, "retval", {"23", "35", "37"}));
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 16, "str", {"24", "29", "31", "33", "36"}));
+          "main", 16, "str", {"70", "65", "72", "74", "77"}));
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 16, "ref.tmp", {"25", "5", "8", "31", "32", "30"}));
+          "main", 16, "ref.tmp", {"66", "9", "6", "29", "72", "73", "71"}));
   doAnalysisAndCompareResults("rvo_01_cpp.ll", GroundTruth, false);
 })
 

unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp

@@ -737,7 +737,7 @@ PHASAR_SKIP_TEST(TEST(LTHTest, HandleSTLString) {
   ProjectIRDB IRDB({unittest::PathToLLTestFiles +
                     "type_hierarchies/type_hierarchy_13_cpp.ll"});
   LLVMTypeHierarchy TH(IRDB);
-  EXPECT_EQ(TH.getAllTypes().size(), 4U);
+  EXPECT_EQ(TH.getAllTypes().size(), 7U);
   EXPECT_TRUE(TH.hasType(TH.getType("class.std::__cxx11::basic_string")));
   EXPECT_TRUE(TH.hasType(
       TH.getType("struct.std::__cxx11::basic_string<char>::_Alloc_hider")));