From 8e0d6b4c1347d3ff7051928042444a1dce1851cc Mon Sep 17 00:00:00 2001
From: Alain Dargelas <alain.dargelas@gmail.com>
Date: Mon, 25 Sep 2023 21:53:41 -0700
Subject: [PATCH] memory leak

---
 src/DesignCompile/CompileExpression.cpp         | 15 ---------------
 third_party/UHDM                                |  2 +-
 third_party/tests/CoresSweRVMP/CoresSweRVMP.log | 14 +++++++-------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/DesignCompile/CompileExpression.cpp b/src/DesignCompile/CompileExpression.cpp
index 3c4a110665..80730e8f2d 100644
--- a/src/DesignCompile/CompileExpression.cpp
+++ b/src/DesignCompile/CompileExpression.cpp
@@ -396,21 +396,6 @@ std::pair<UHDM::task_func *, DesignComponent *> CompileHelper::getTaskFunc(
   return result;
 }
 
-bool getStringVal(std::string &result, expr *val) {
-  const UHDM::constant *hs0 = any_cast<const UHDM::constant *>(val);
-  if (hs0) {
-    s_vpi_value *sval = String2VpiValue(hs0->VpiValue());
-    if (sval) {
-      if (sval->format == vpiStringVal || sval->format == vpiBinStrVal) {
-        result = sval->value.str;
-        delete sval;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
 static bool largeInt(std::string_view str) {
   bool isSigned = false;
   size_t pos = str.find('\'');
diff --git a/third_party/UHDM b/third_party/UHDM
index 0ae40800cc..86224a8557 160000
--- a/third_party/UHDM
+++ b/third_party/UHDM
@@ -1 +1 @@
-Subproject commit 0ae40800cc120c5bba0131d8c21670d0b6f60e32
+Subproject commit 86224a855754970fd9be2d5978e6d3b84461bad5
diff --git a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
index 914bb61648..3514ef24a1 100644
--- a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
+++ b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
@@ -131,14 +131,14 @@ CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
   CMake that the project does not need compatibility with older versions.
 
 
--- Configuring done (0.1s)
+-- Configuring done (0.0s)
 -- Generating done (0.0s)
 -- Build files have been written to: ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess
 [  6%] Generating 10_lsu_bus_intf.sv
+[ 12%] Generating 12_beh_lib.sv
 [ 18%] Generating 11_ifu_bp_ctl.sv
-[ 18%] Generating 12_beh_lib.sv
-[ 25%] Generating 14_mem_lib.sv
-[ 31%] Generating 13_ifu_mem_ctl.sv
+[ 25%] Generating 13_ifu_mem_ctl.sv
+[ 31%] Generating 14_mem_lib.sv
 [ 37%] Generating 15_exu.sv
 [ 43%] Generating 16_dec_decode_ctl.sv
 [ 50%] Generating 1_lsu_stbuf.sv
@@ -146,9 +146,9 @@ CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
 [ 62%] Generating 3_rvjtag_tap.sv
 [ 68%] Generating 4_dec_tlu_ctl.sv
 [ 75%] Generating 5_lsu_bus_buffer.sv
-[ 81%] Generating 7_axi4_to_ahb.sv
-[ 87%] Generating 6_dbg.sv
-[ 93%] Generating 8_ifu_aln_ctl.sv
+[ 81%] Generating 6_dbg.sv
+[ 87%] Generating 8_ifu_aln_ctl.sv
+[ 93%] Generating 7_axi4_to_ahb.sv
 [100%] Generating 9_tb_top.sv
 [100%] Built target Parse
 Surelog parsing status: 0