usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

tracer: return default name on unrecognized opcode.

Browse source 
The default name is more commonly returned on code such as:

    x, y = Signal(), Signal()

The case where the opcode is not recognized is only encountered
when older Amaranth is ran on a newer Python interpreter (with more
opcodes).

Returning None instead of a name here caused issues in the RTLIL
backend, which would incorrectly use $\d+ names for ports, since
the RTLIL backend assumed the name of a signal is always a string.

Fixes #733.
This commit is contained in:
Catherine 2023-01-31 10:32:44 +00:00
parent 2ca421dea8
commit aaec7e0d27
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
amaranth/tracer.py
View file

@ -24,8 +24,9 @@ def get_var_name(depth=2, default=_raise_exception):
call_index += 2 call_index += 2
else: else:
break break
if call_opc not in ("CALL_FUNCTION", "CALL_FUNCTION_KW", "CALL_FUNCTION_EX", "CALL_METHOD", "CALL"): if call_opc not in ("CALL_FUNCTION", "CALL_FUNCTION_KW", "CALL_FUNCTION_EX",
return None "CALL_METHOD", "CALL"):
return default
index = call_index + 2 index = call_index + 2
while True: while True: