Clang 18 (#7)

moved to clang 18

CppCheckSuppressions.txt

@@ -3,6 +3,10 @@
 nullPointer:*/tchecker/src/refzg/refzg.cc:[181, 176, 189, 190, 197, 203, 208]
 uninitdata:*/include/tchecker/utils/shared_objects.hh
 nullPointer:*/src/refzg/refzg.cc
+duplInheritedMember:*
+uninitMemberVar:*/include/tchecker/utils/hashtable.hh
+uninitMemberVar:*/include/tchecker/vm/vm.hh
+accessMoved:*/include/tchecker/utils/array.hh
 
 // the following is a known cppcheck bug
 internalAstError:*/include/tchecker/graph/directed_graph.hh

ci-scripts/Dockerfile

@@ -6,7 +6,6 @@ RUN apt update && \
     git cmake bison flex doxygen wget \
     valgrind graphviz cppcheck
 
-
 FROM base as gcc-image
 RUN apt install -y gcc-12 g++-12 \
     build-essential g++ python-dev-is-python3 autotools-dev libicu-dev libbz2-dev && \
@@ -34,10 +33,10 @@ ENTRYPOINT ["/bin/bash", "-s"]
 
 FROM base as clang-image
 
-RUN apt install -y clang-13 \
+RUN apt install -y clang-18 \
     build-essential g++ python-dev-is-python3 autotools-dev libicu-dev libbz2-dev && \
-    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 1 && \
-    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 1
+    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 1 && \
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 1
 
 RUN apt --purge remove libboost-all-dev libboost-doc libboost-dev
 
@@ -48,7 +47,7 @@ RUN wget http://downloads.sourceforge.net/project/boost/boost/1.81.0/boost_1_81_
     ./b2 --with=all install && \
     cd ..
 
-RUN git clone --branch v3.2.0 https://github.com/catchorg/Catch2.git /tmp/catch2
+RUN git clone --branch v3.7.0 https://github.com/catchorg/Catch2.git /tmp/catch2
 
 RUN mkdir -p /tmp/catch2/build && \
     cd /tmp/catch2/build && \

include/tchecker/zg/zone_container.hh

@@ -143,6 +143,8 @@ public:
     for(auto iter = this->begin(); iter < this->end(); iter++) {
       if((*iter)->is_empty()) {
         _storage->erase(iter);
+       this->remove_empty();
+       return;
       }
     }
   }

src/tck-compare/vcg-timed-bisim.cc

@@ -51,7 +51,6 @@ void check_for_init(std::shared_ptr<tchecker::system::system_t> const system){
 }
 
 tchecker::clock_id_t clocks_check(std::shared_ptr<tchecker::ta::system_t> const system) {
-  std::size_t result = 0;
   auto p_c = system->clock_variables().identifiers(tchecker::VK_FLATTENED);
   for(auto it = p_c.begin(); it != p_c.end(); ++it) {
     std::string clock_name{system->clock_name(*it)};
@@ -61,7 +60,6 @@ tchecker::clock_id_t clocks_check(std::shared_ptr<tchecker::ta::system_t> const
           error_message.append(" is reserved for virtual clocks and should not be used by the TA.");
           throw std::runtime_error(error_message);
     }
-    ++result;
   }
   return system->clocks_count(VK_FLATTENED);
 }