From 68b1972fc67a2e2485a4566c11eb3d2f715c9cab Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 22 Dec 2018 00:02:31 +0000 Subject: [PATCH] compat: do not finalize native submodules twice. --- nmigen/compat/fhdl/module.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nmigen/compat/fhdl/module.py b/nmigen/compat/fhdl/module.py index 84b51a1..dca892e 100644 --- a/nmigen/compat/fhdl/module.py +++ b/nmigen/compat/fhdl/module.py @@ -122,9 +122,6 @@ class CompatModule: elif name == "_submodules": self._submodules = [] return self._submodules - elif name == "_specials": - self._specials = [] - return self._specials elif name == "_clock_domains": self._clock_domains = [] return self._clock_domains @@ -135,22 +132,22 @@ class CompatModule: raise AttributeError("'{}' object has no attribute '{}'" .format(type(self).__name__, name)) - def _finalize_submodules(self): + def _finalize_submodules(self, finalize_native): for name, submodule in self._submodules: if hasattr(submodule, "get_fragment_called"): # Compat submodule if not submodule.get_fragment_called: self._module._add_submodule(submodule.get_fragment(), name) - else: + elif finalize_native: # Native submodule self._module._add_submodule(submodule, name) def finalize(self, *args, **kwargs): if not self.finalized: self.finalized = True - self._finalize_submodules() + self._finalize_submodules(finalize_native=False) self.do_finalize(*args, **kwargs) - self._finalize_submodules() + self._finalize_submodules(finalize_native=True) def do_finalize(self): pass -- 2.30.2