hdl._ir: Remove support for non-Elaboratable elaboratables.

Fixes #1216.
This commit is contained in:
Wanda 2024-03-19 22:23:30 +01:00 committed by Catherine
parent 2569886464
commit 8c65a79cdd
3 changed files with 7 additions and 14 deletions

View file

@ -45,17 +45,8 @@ class Fragment:
UnusedElaboratable._MustUse__silence = False
obj._MustUse__used = True
new_obj = obj.elaborate(platform)
elif hasattr(obj, "elaborate"):
warnings.warn(
message="Class {!r} is an elaboratable that does not explicitly inherit from "
"Elaboratable; doing so would improve diagnostics"
.format(type(obj)),
category=RuntimeWarning,
stacklevel=2)
code = obj.elaborate.__code__
new_obj = obj.elaborate(platform)
else:
raise AttributeError(f"Object {obj!r} cannot be elaborated")
raise TypeError(f"Object {obj!r} is not an 'Elaboratable' nor 'Fragment'")
if new_obj is obj:
raise RecursionError(f"Object {obj!r} elaborates to itself")
if new_obj is None and code is not None:

View file

@ -37,6 +37,7 @@ Apply the following changes to code written against Amaranth 0.4 to migrate it t
* Replace uses of ``amaranth.hdl.Memory`` with ``amaranth.lib.memory.Memory``
* Replace imports of ``amaranth.asserts.{Assert, Assume, Cover}`` with imports from ``amaranth.hdl``
* Remove any usage of ``name=`` with assertions, possibly replacing them with custom messages
* Ensure all elaboratables are subclasses of :class:`Elaboratable`
Implemented RFCs
@ -89,6 +90,7 @@ Language changes
* Removed: (deprecated in 0.4) :class:`Repl`. (`RFC 10`_)
* Removed: (deprecated in 0.4) :class:`ast.Sample`, :class:`ast.Past`, :class:`ast.Stable`, :class:`ast.Rose`, :class:`ast.Fell`.
* Removed: assertion names in :class:`Assert`, :class:`Assume` and :class:`Cover`. (`RFC 50`_)
* Removed: accepting non-subclasses of :class:`Elaboratable` as elaboratables.
Standard library changes

View file

@ -23,14 +23,14 @@ class ElaboratesToSelf(Elaboratable):
class FragmentGetTestCase(FHDLTestCase):
def test_get_wrong_none(self):
with self.assertRaisesRegex(AttributeError,
r"^Object None cannot be elaborated$"):
with self.assertRaisesRegex(TypeError,
r"^Object None is not an 'Elaboratable' nor 'Fragment'$"):
Fragment.get(None, platform=None)
with self.assertWarnsRegex(UserWarning,
r"^\.elaborate\(\) returned None; missing return statement\?$"):
with self.assertRaisesRegex(AttributeError,
r"^Object None cannot be elaborated$"):
with self.assertRaisesRegex(TypeError,
r"^Object None is not an 'Elaboratable' nor 'Fragment'$"):
Fragment.get(ElaboratesToNone(), platform=None)
def test_get_wrong_self(self):