Fixed expression API to return const symbol_t& where GCC-13 complai…

…ns about possible dangling
UPPAALModelChecker · Sep 22, 2023 · 57e50fd · 57e50fd
1 parent 15acb20
commit 57e50fd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/cmake/doctest.cmake b/cmake/doctest.cmake
@@ -6,6 +6,9 @@ else(doctest_FOUND)
  message(STATUS "Failed to find doctest, going to make it from scratch.")
  include(FetchContent)
  set(DOCTEST_WITH_TESTS OFF CACHE BOOL "doctest tests")
+ set(DOCTEST_WITH_MAIN_IN_STATIC_LIB ON CACHE BOOL "static lib (cmake target) with a default main entry point")
+ set(DOCTEST_NO_INSTALL ON CACHE BOOL "Skip the installation process")
+ set(DOCTEST_USE_STD_HEADERS OFF CACHE BOOL "Use std headers")
  FetchContent_Declare(doctest
  GIT_REPOSITORY git@github.com:doctest/doctest.git
  GIT_TAG v2.4.11

diff --git a/getlibs/getlibs.sh b/getlibs/getlibs.sh
@@ -51,7 +51,7 @@ for target in "$@" ; do
  echo -e "${BW}${target}: Configuring ${DOCTEST}${NC}"
  cmake -S "$SOURCE/$DOCTEST" -B "$BUILD" -DCMAKE_TOOLCHAIN_FILE="$PROJECT_DIR/cmake/toolchain/${target}.cmake" \
  -DCMAKE_PREFIX_PATH="$LIBS" -DCMAKE_INSTALL_PREFIX="$LIBS" -DCMAKE_BUILD_TYPE=Release \
- -DDOCTEST_WITH_TESTS=OFF -DDOCTEST_WITH_MAIN_IN_STATIC_LIB=ON
+ -DDOCTEST_WITH_TESTS=OFF -DDOCTEST_WITH_MAIN_IN_STATIC_LIB=ON -DDOCTEST_USE_STD_HEADERS=OFF
  echo -e "${BW}${target}: Building ${DOCTEST}${NC}"
  cmake --build "$BUILD"
  #echo -e "${BW}${target}: Testing ${DOCTEST}${NC}"

diff --git a/include/utap/expression.h b/include/utap/expression.h
@@ -166,7 +166,7 @@ class expression_t
  * (s.f).get_symbol() returns 's'
  * (i<1?j:k).get_symbol() returns 'j'
  */
- symbol_t get_symbol();
+ const symbol_t& get_symbol();
 
  /**
  * Returns the set of symbols this expression might resolve
@@ -182,7 +182,7 @@ class expression_t
 
  /** Returns the symbol this expression evaluates to. Notice
  that not all expression evaluate to a symbol. */
- const symbol_t get_symbol() const;
+ const symbol_t& get_symbol() const;
 
  /** Returns true if this expression is a reference to a
  symbol in the given set. */

diff --git a/src/ExpressionBuilder.cpp b/src/ExpressionBuilder.cpp
@@ -319,7 +319,7 @@ void ExpressionBuilder::expr_call_end(uint32_t n)
 {
  expression_t e;
  type_t type;
- instance_t* instance;
+ const instance_t* instance;
 
  /* n+1'th element from the top is the identifier.
  */
@@ -352,7 +352,7 @@ void ExpressionBuilder::expr_call_end(uint32_t n)
  if (expr.size() - 1 != id.get_type().size()) {
  handle_error(TypeException{"$Wrong_number_of_arguments"});
  }
- instance = static_cast<instance_t*>(id.get_symbol().get_data());
+ instance = static_cast<const instance_t*>(id.get_symbol().get_data());
 
  /* Process set lookups are represented as expressions indexing
  * into an array. To satisfy the type checker, we create a

diff --git a/src/expression.cpp b/src/expression.cpp
@@ -635,9 +635,9 @@ bool expression_t::equal(const expression_t& e) const
  case of inline if, the symbol referenced by the 'true' part is
  returned.
 */
-symbol_t expression_t::get_symbol() { return ((const expression_t*)this)->get_symbol(); }
+const symbol_t& expression_t::get_symbol() { return ((const expression_t*)this)->get_symbol(); }
 
-const symbol_t expression_t::get_symbol() const
+const symbol_t& expression_t::get_symbol() const
 {
  assert(data);
 
@@ -674,7 +674,9 @@ const symbol_t expression_t::get_symbol() const
 
  case SCENARIO: return get(0).get_symbol();
 
- default: return symbol_t();
+ default:
+ assert(false);
+ // return symbol_t();
  }
 }