refactor: simplify branch code with loop merge, function promotion, and match dedup

- Merge two separate function_symbols loops into a single pass in kompile.py
- Promote _normalize_symbol_hashes to module-level in fixtures.py
- Hoist duplicated def_id assignment out of match arms in utils.py

Author: Stevengre

kmir/src/kmir/kompile.py

@@ -521,23 +521,21 @@ def _functions(kmir: KMIR, smir_info: SMIRInfo) -> dict[int, KInner]:
         for ty in smir_info.function_symbols_reverse[item_name]:
             functions[ty] = parsed_item_kinner.args[1]
 
-    # Add intrinsic functions
+    # Add intrinsic functions and linked normal symbols that have no local body in `items`.
+    # Normal symbols must still map to `monoItemFn(..., noBody)` instead of falling back to UNKNOWN FUNCTION.
     for ty, sym in smir_info.function_symbols.items():
-        if 'IntrinsicSym' in sym and ty not in functions:
+        if ty in functions:
+            continue
+        if 'IntrinsicSym' in sym:
             functions[ty] = KApply(
                 'IntrinsicFunction',
                 [KApply('symbol(_)_LIB_Symbol_String', [stringToken(sym['IntrinsicSym'])])],
             )
-
-    # Add linked normal symbols that have no local body in `items`.
-    # They must still map to `monoItemFn(..., noBody)` instead of falling back to UNKNOWN FUNCTION.
-    for ty, sym in smir_info.function_symbols.items():
-        normal_sym = sym.get('NormalSym')
-        if isinstance(normal_sym, str) and ty not in functions:
+        elif isinstance(sym.get('NormalSym'), str):
             functions[ty] = KApply(
                 'MonoItemKind::MonoItemFn',
                 (
-                    KApply('symbol(_)_LIB_Symbol_String', (stringToken(normal_sym),)),
+                    KApply('symbol(_)_LIB_Symbol_String', (stringToken(sym['NormalSym']),)),
                     KApply('defId(_)_BODY_DefId_Int', (intToken(ty),)),
                     KApply('noBody_BODY_MaybeBody', ()),
                 ),

kmir/src/kmir/testing/fixtures.py

@@ -20,18 +20,19 @@ def pytest_configure(config) -> None:
     sys.setrecursionlimit(1000000)
 
 
+def _normalize_symbol_hashes(text: str) -> str:
+    """Normalize rustc symbol hash suffixes that drift across builds/environments."""
+    text = re.sub(r'(_ZN[0-9A-Za-z_]+17h)[0-9a-f]+E', r'\1<hash>E', text)
+    # Some show outputs truncate mangled symbols before trailing `E`.
+    text = re.sub(r'(_ZN[0-9A-Za-z_]+17h)[0-9a-f]+', r'\1<hash>', text)
+    # Normalize demangled hash suffixes (`...::h<hex>`).
+    text = re.sub(r'(::h)[0-9a-f]{8,}', r'\1<hash>', text)
+    return text
+
+
 def assert_or_update_show_output(
     actual_text: str, expected_file: Path, *, update: bool, path_replacements: dict[str, str] | None = None
 ) -> None:
-    def _normalize_symbol_hashes(text: str) -> str:
-        # Mangled symbol hash suffixes can drift across rustc versions/builds.
-        text = re.sub(r'(_ZN[0-9A-Za-z_]+17h)[0-9a-f]+E', r'\1<hash>E', text)
-        # Some show outputs truncate mangled symbols before trailing `E`.
-        text = re.sub(r'(_ZN[0-9A-Za-z_]+17h)[0-9a-f]+', r'\1<hash>', text)
-        # Normalize demangled hash suffixes (`...::h<hex>`).
-        text = re.sub(r'(::h)[0-9a-f]{8,}', r'\1<hash>', text)
-        return text
-
     if path_replacements:
         for old, new in path_replacements.items():
             actual_text = actual_text.replace(old, new)

kmir/src/kmir/utils.py

@@ -319,7 +319,6 @@ def _annotate_nobody_function(k_cell: KInner, smir_info: SMIRInfo) -> list[str]:
                     operands,
                     KApply(label=KLabel(name='span'), args=[KToken(token=span_str)]),
                 ]:
-                    def_id = int(def_id_str)
                     span = int(span_str)
                 case [
                     KApply(
@@ -332,13 +331,14 @@ def _annotate_nobody_function(k_cell: KInner, smir_info: SMIRInfo) -> list[str]:
                     ),
                     operands,
                 ]:
-                    def_id = int(def_id_str)
-                    span = None
+                    pass
                 case _:
                     return []
         case _:
             return []
 
+    def_id = int(def_id_str)
+
     # Prefer concrete symbol from the term; for unresolved placeholders, fall back to DefId lookup.
     if symbol_name == '\"** UNKNOWN FUNCTION **\"':
         func_sym = smir_info.function_symbols.get(def_id, {})