fix(hermes-base): treat operand-width opcode variants and switch jump-table offsets as equivalent in the verification

With a base whose string set differs from the new bundle (e.g. the newest legacy
version of an app), the new code's hot strings get large ids and hermesc emits
GetById/LoadConstStringLongIndex instead of the Short forms, and switch jump
tables move with instruction widths. The disassembly compare reported those
as non-equivalent and dropped a perfectly good delta build. Fold the
Short/Long/LongIndex suffix (and hermesc's column padding) and the switch
table offsets; unit-tested, and verified on a real production base (v98) and
on the RN 0.77 (v96) chain.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: sunnylqm

src/utils/hermes-base.ts

@@ -622,7 +622,19 @@ export function normalizeDisassemblyLine(
   m = /^(\s*J[A-Za-z]+?)(Long)?\s+(L\d+|\d+)(.*)$/.exec(line);
   if (m) return `${m[1]} <tgt>${m[4]}`;
   m = /^(\s*DefineOwnById\w*\s+r\d+, r\d+, \d+, )(\d+)$/.exec(line);
-  if (m) return `${m[1]}"${strings.get(Number(m[2])) ?? `?${m[2]}`}"`;
+  if (m) line = `${m[1]}"${strings.get(Number(m[2])) ?? `?${m[2]}`}"`;
+  // Operand-width variants of one instruction (GetByIdShort/GetById/GetByIdLong,
+  // LoadConstString/LoadConstStringLongIndex, ...) only differ by how wide a
+  // string/function id or offset is encoded — a foreign base hands the new
+  // code's hot strings large ids, so the delta build legitimately picks the
+  // wider form. Fold the suffix and the column padding that follows it.
+  m = /^(\s*)([A-Za-z]+?)(?:LongIndex|Long|Short)?(\s+.*|)$/.exec(line);
+  if (m) line = `${m[1]}${m[2]}${m[3].replace(/\s+/g, ' ')}`;
+  // switch jump tables sit after the instructions; their relative offset (and
+  // the table header hermesc prints for them) moves with instruction widths
+  m = /^(\s*(?:String|UInt)?SwitchImm r\d+, \d+, )\d+(, .*)$/.exec(line);
+  if (m) line = `${m[1]}<jt>${m[2]}`;
+  if (/^\s*offset \d+$/.test(line)) line = line.replace(/\d+$/, '<jt>');
   return line;
 }
 

tests/hermes-base.test.ts

@@ -415,9 +415,33 @@ describe('helpers', () => {
     expect(
       normalizeDisassemblyLine('Offset in debug table: source 0x0000', strings),
     ).toBeNull();
+    // operand-width variants and padding fold together (foreign base → wide ids)
+    expect(
+      normalizeDisassemblyLine(
+        '    GetByIdShort      r1, r1, 4, "process"',
+        strings,
+      ),
+    ).toBe(
+      normalizeDisassemblyLine(
+        '    GetById           r1, r1, 4, "process"',
+        strings,
+      ),
+    );
+    expect(
+      normalizeDisassemblyLine('    LoadConstStringLongIndex r0, "x"', strings),
+    ).toBe('    LoadConstString r0, "x"');
+    expect(
+      normalizeDisassemblyLine(
+        '    StringSwitchImm   r13, 2, 4024, L146, 150',
+        strings,
+      ),
+    ).toBe('    StringSwitchImm r13, 2, <jt>, L146, 150');
+    expect(normalizeDisassemblyLine('  offset 4024', strings)).toBe(
+      '  offset <jt>',
+    );
     expect(
       normalizeDisassemblyLine('    GetByIdShort r3, r0, 2, "s"', strings),
-    ).toBe('    GetByIdShort r3, r0, 2, "s"');
+    ).toBe('    GetById r3, r0, 2, "s"');
   });
 });