Latch fix

chipsalliance · Nov 9, 2023 · 2fc7587 · 2fc7587
1 parent b746752
commit 2fc7587
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/frontends/systemverilog/uhdm_ast_frontend.cc b/frontends/systemverilog/uhdm_ast_frontend.cc
@@ -43,8 +43,10 @@ struct UhdmAstFrontend : public UhdmCommonFrontend {
         UHDM::Serializer serializer;
 
         std::vector<vpiHandle> restoredDesigns = serializer.Restore(filename);
+        vpiHandle designH = restoredDesigns.at(0);
+        UHDM::design *design = UhdmDesignFromVpiHandle(designH);
         UHDM::SynthSubset *synthSubset =
-          make_new_object_with_optional_extra_true_arg<UHDM::SynthSubset>(&serializer, this->shared.nonSynthesizableObjects, false);
+          make_new_object_with_optional_extra_true_arg<UHDM::SynthSubset>(&serializer, this->shared.nonSynthesizableObjects, design, false);
         synthSubset->listenDesigns(restoredDesigns);
         delete synthSubset;
         UhdmAst uhdm_ast(this->shared);

diff --git a/frontends/systemverilog/uhdm_surelog_ast_frontend.cc b/frontends/systemverilog/uhdm_surelog_ast_frontend.cc
@@ -201,9 +201,11 @@ struct UhdmSurelogAstFrontend : public UhdmCommonFrontend {
         // `-defer` turns elaboration off, so check for it
         // Should be called 1. for normal flow 2. after finishing with `-link`
         if (!this->shared.defer) {
+            vpiHandle designH = uhdm_designs.at(0);
+            UHDM::design *design = UhdmDesignFromVpiHandle(designH);
             UHDM::Serializer serializer;
             UHDM::SynthSubset *synthSubset =
-              make_new_object_with_optional_extra_true_arg<UHDM::SynthSubset>(&serializer, this->shared.nonSynthesizableObjects, false);
+              make_new_object_with_optional_extra_true_arg<UHDM::SynthSubset>(&serializer, this->shared.nonSynthesizableObjects, design, false);
             synthSubset->listenDesigns(uhdm_designs);
             delete synthSubset;
         }

diff --git a/third_party/surelog b/third_party/surelog