@asmlift/core 0.9.0 → 0.10.0

package/src/raise/recover.ts

@@ -2,8 +2,9 @@
 // (signed comparisons/divisions ⇒ signed operands), types memory-access bases as pointers,
 // propagates pointer-ness across the SSA, then defaults the rest to s32. Emits recovered
 // types onto the SSA values in place.
-import { Fn, Value, defOpMap } from '../ir/core';
+import { Fn, RETURNS_OBJECT, Value, defOpMap } from '../ir/core';
 import { IrType, T, scalarTypeForAccess, typeEquals } from '../ir/types';
+import { storeSigned } from './storesign';
 
 const SIGNED_CMP = new Set(['icmp_slt', 'icmp_sle', 'icmp_sgt', 'icmp_sge']);
 const UNSIGNED_CMP = new Set(['icmp_ult', 'icmp_ule', 'icmp_ugt', 'icmp_uge']);
@@ -87,7 +88,7 @@ function typeDerefBases(fn: Fn): void {
           break;
         case 'store':
           width = op.attrs.width as number;
-          signed = width === 4;
+          signed = storeSigned(op, width);
           break;
         case 'aload':
           width = op.attrs.elemSize as number;
@@ -95,9 +96,7 @@ function typeDerefBases(fn: Fn): void {
           break;
         case 'astore':
           width = op.attrs.elemSize as number;
-          // an astore carries no signedness of its own unless a recovery recorded the member's;
-          // structure.ts reads it by the same rule
-          signed = (op.attrs.signed as boolean | undefined) ?? width === 4;
+          signed = storeSigned(op, width);
           break;
         default:
           continue;
@@ -250,6 +249,14 @@ export function returnType(fn: Fn): IrType {
     const term = b.ops[b.ops.length - 1];
     if (term?.opcode === 'ret' && term.operands.length > 0) {
       const v = term.operands[0];
+      // the function's own struct return object, handed back whole (ir/core.ts `RETURNS_OBJECT`)
+      if (term.attrs[RETURNS_OBJECT] === true && v.type.kind === 'ptr') {
+        return v.type.to;
+      }
+      // a struct a call returned by value, handed back whole (frontend/register-struct-call.ts)
+      if (v.type.kind === 'struct') {
+        return v.type;
+      }
       // A NARROW value in the return register does not make the DECLARED return type narrow: the
       // register is a word, and the value's width says how it was COMPUTED, not what the header
       // spelled. The two readings compile alike through agbcc and do NOT through mwcc —