update

Author: ladisgin

include/klee/Module/Annotation.h

@@ -35,7 +35,7 @@ enum class Property {
 };
 
 struct Unknown {
-  explicit Unknown(const std::string &str = "Unknown");
+  explicit Unknown(std::string str = "Unknown");
   virtual ~Unknown();
 
   virtual bool operator==(const Unknown &other) const;
@@ -49,13 +49,13 @@ struct Unknown {
 };
 
 struct Deref final : public Unknown {
-  explicit Deref(const std::string &str = "Deref");
+  explicit Deref(std::string str = "Deref");
 
   [[nodiscard]] Kind getKind() const override;
 };
 
 struct InitNull final : public Unknown {
-  explicit InitNull(const std::string &str = "InitNull");
+  explicit InitNull(std::string str = "InitNull");
 
   [[nodiscard]] Kind getKind() const override;
 };

lib/Module/Annotation.cpp

@@ -4,6 +4,7 @@
 
 #include <fstream>
 #include <llvm/Support/raw_ostream.h>
+#include <utility>
 
 #ifdef ENABLE_XML_ANNOTATION
 #include "pugixml.hpp"
@@ -20,7 +21,7 @@ static inline std::string toLower(const std::string &str) {
 
 namespace Statement {
 
-Unknown::Unknown(const std::string &str) : str(str) { initOffset(); }
+Unknown::Unknown(std::string str) : str(std::move(str)) { initOffset(); }
 
 Unknown::~Unknown() = default;
 
@@ -75,11 +76,11 @@ void Unknown::initOffset() {
   }
 }
 
-Deref::Deref(const std::string &str) : Unknown(str) {}
+Deref::Deref(std::string str) : Unknown(std::move(str)) {}
 
 Kind Deref::getKind() const { return Kind::Deref; }
 
-InitNull::InitNull(const std::string &str) : Unknown(str) {}
+InitNull::InitNull(std::string str) : Unknown(std::move(str)) {}
 
 Kind InitNull::getKind() const { return Kind::InitNull; }
 
@@ -221,6 +222,10 @@ AnnotationsMap parseAnnotationsXml(const pugi::xml_document &annotationsXml,
       for (pugi::xml_node keyword : customRule.child("Keywords")) {
         std::string name = keyword.attribute("name").value();
         std::string isRegex = keyword.attribute("isRegex").value();
+        if (toLower(isRegex) == "true") {
+          klee_warning("Annotation: regexp currently not implemented");
+          continue;
+        }
         std::string value = keyword.attribute("value").value();
         std::string type = keyword.attribute("type").value();
         std::string pairedTo = keyword.attribute("pairedTo").value();