Merge pull request #3666 from alainmarcel/alainmarcel-patch-1

purge antlr cache when deleting parsers

Author: alaindargelas

src/SourceCompile/AntlrParserHandler.cpp

@@ -33,6 +33,8 @@ AntlrParserHandler::~AntlrParserHandler() {
   delete m_errorListener;
   // ParseTree is deleted in antlr4::ParseTreeTracker
   // delete m_tree; // INVALID MEMORY READ can be seen in AdvancedDebug
+  m_lexer->getInterpreter<antlr4::atn::LexerATNSimulator>()->clearDFA();
+  m_parser->getInterpreter<antlr4::atn::ParserATNSimulator>()->clearDFA();
   delete m_parser;
   delete m_tokens;
   delete m_lexer;

src/SourceCompile/PreprocessFile.cpp

@@ -312,6 +312,8 @@ PreprocessFile::~PreprocessFile() {
 PreprocessFile::AntlrParserHandler::~AntlrParserHandler() {
   delete m_errorListener;
   // delete m_pptree;  // INVALID MEMORY READ can be seen in AdvancedDebug
+  m_pplexer->getInterpreter<antlr4::atn::LexerATNSimulator>()->clearDFA();
+  m_ppparser->getInterpreter<antlr4::atn::ParserATNSimulator>()->clearDFA();
   delete m_ppparser;
   delete m_pptokens;
   delete m_pplexer;

third_party/tests/CoresSweRVMP/CoresSweRVMP.log

@@ -118,18 +118,18 @@ Running: cd ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess;
 -- 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 16_dec_decode_ctl.sv
-[ 12%] Generating 1_lsu_stbuf.sv
-[ 18%] Generating 10_lsu_bus_intf.sv
-[ 25%] Generating 12_beh_lib.sv
-[ 31%] Generating 13_ifu_mem_ctl.sv
-[ 37%] Generating 11_ifu_bp_ctl.sv
-[ 43%] Generating 15_exu.sv
-[ 50%] Generating 14_mem_lib.sv
+[  6%] Generating 10_lsu_bus_intf.sv
+[ 12%] Generating 11_ifu_bp_ctl.sv
+[ 18%] Generating 12_beh_lib.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
 [ 56%] Generating 2_ahb_to_axi4.sv
 [ 62%] Generating 3_rvjtag_tap.sv
-[ 68%] Generating 4_dec_tlu_ctl.sv
-[ 75%] Generating 5_lsu_bus_buffer.sv
+[ 68%] Generating 5_lsu_bus_buffer.sv
+[ 75%] Generating 4_dec_tlu_ctl.sv
 [ 81%] Generating 6_dbg.sv
 [ 87%] Generating 7_axi4_to_ahb.sv
 [ 93%] Generating 8_ifu_aln_ctl.sv