@shapeshift-labs/frontier-lang-parser 0.3.73 → 0.3.75

package/dist/metadata.js

@@ -269,6 +269,7 @@ function mergeResourceGraphBlocks(blocks) {
     pointerEdgeIds: blocks.flatMap((block) => ids(block.graph?.pointerEdges)),
     memoryAccessIds: blocks.flatMap((block) => ids(block.graph?.memoryAccesses)),
     abiBoundaryIds: blocks.flatMap((block) => ids(block.graph?.abiBoundaries)),
+    synchronizationEdgeIds: blocks.flatMap((block) => ids(block.graph?.synchronizationEdges)),
     trapIds: blocks.flatMap((block) => ids(block.graph?.traps)),
     undefinedBehaviorIds: blocks.flatMap((block) => ids(block.graph?.undefinedBehaviors)),
     conflictIds: blocks.flatMap((block) => ids(block.graph?.conflicts)),
@@ -287,17 +288,16 @@ function mergeResourceGraphBlocks(blocks) {
       lifetimeRelationCount: sum(blocks, 'lifetimeRelations'),
       borrowScopeCount: sum(blocks, 'borrowScopes'),
       unsafeBoundaryCount: sum(blocks, 'unsafeBoundaries'),
-      memoryRegionCount: sum(blocks, 'memoryRegions'),
-      dataLayoutCount: sum(blocks, 'dataLayouts'),
-      pointerEdgeCount: sum(blocks, 'pointerEdges'),
-      memoryAccessCount: sum(blocks, 'memoryAccesses'),
-      abiBoundaryCount: sum(blocks, 'abiBoundaries'),
+      memoryRegionCount: sum(blocks, 'memoryRegions'), dataLayoutCount: sum(blocks, 'dataLayouts'),
+      pointerEdgeCount: sum(blocks, 'pointerEdges'), memoryAccessCount: sum(blocks, 'memoryAccesses'),
+      abiBoundaryCount: sum(blocks, 'abiBoundaries'), synchronizationEdgeCount: sum(blocks, 'synchronizationEdges'),
       trapCount: sum(blocks, 'traps'),
       undefinedBehaviorCount: sum(blocks, 'undefinedBehaviors'),
       lowLevelPrimitiveCount: sum(blocks, 'lowLevelPrimitives'),
       conflictCount: sum(blocks, 'conflicts'),
       proofObligationCount: sum(blocks, 'proofObligations'),
       unsafeBoundariesWithoutProof: sum(blocks, 'unsafeBoundariesWithoutProof'),
+      synchronizationEdgeWithoutProofCount: sum(blocks, 'synchronizationEdgesWithoutProof'),
       failClosedTrapCount: sum(blocks, 'failClosedTraps'),
       trapWithoutProofCount: sum(blocks, 'trapsWithoutProof'),
       undefinedBehaviorWithoutProofCount: sum(blocks, 'undefinedBehaviorsWithoutProof')

package/dist/resource-graph-low-level.js

@@ -4,6 +4,7 @@ export function parseLowLevelResourceRecord(kind, common, name, text) {
   if (kind === 'pointerEdge') return cleanRecord({ ...common, resourceId: word('resource', text) ?? word('resourceId', text), targetResourceId: word('targetResource', text) ?? word('targetResourceId', text) ?? word('target', text), ownerId: word('owner', text) ?? word('ownerId', text), lifetimeRegionId: word('lifetime', text) ?? word('lifetimeRegion', text) ?? word('lifetimeRegionId', text), pointerKind: word('pointerKind', text) ?? word('kind', text) ?? 'pointer', addressSpace: word('addressSpace', text) ?? word('space', text), pointerWidth: number('pointerWidth', text), aliasKind: word('aliasKind', text), mode: word('mode', text), provenance: word('provenance', text), nullable: flag('nullable', text), mutable: flag('mutable', text) });
   if (kind === 'memoryAccess') return cleanRecord({ ...common, resourceId: word('resource', text) ?? word('resourceId', text), accessKind: word('accessKind', text) ?? word('kind', text) ?? name, operationKind: word('operation', text) ?? word('operationKind', text), memoryOrder: word('memoryOrder', text) ?? word('ordering', text), lockId: word('lock', text) ?? word('lockId', text), synchronizationKey: word('sync', text) ?? word('synchronizationKey', text), reads: list(text, 'read', 'reads'), writes: list(text, 'write', 'writes'), volatile: flag('volatile', text), atomic: flag('atomic', text), proofStatus: word('proofStatus', text) ?? word('status', text) ?? 'missing' });
   if (kind === 'abiBoundary') return cleanRecord({ ...common, resourceId: word('resource', text) ?? word('resourceId', text), callableId: word('callable', text) ?? word('callableId', text), functionId: word('function', text) ?? word('functionId', text), boundaryKind: word('boundaryKind', text) ?? word('kind', text) ?? 'abi-boundary', abi: word('abi', text), abiKind: word('abiKind', text), callingConvention: word('callingConvention', text) ?? word('convention', text), pointerWidth: number('pointerWidth', text), endian: word('endian', text) ?? word('endianness', text), ffiBoundary: word('ffiBoundary', text), proofStatus: word('proofStatus', text) ?? word('status', text) ?? 'missing' });
+  if (kind === 'synchronizationEdge') return cleanRecord({ ...common, resourceId: word('resource', text) ?? word('resourceId', text), fromMemoryAccessId: word('fromAccess', text) ?? word('fromAccessId', text) ?? word('fromMemoryAccess', text) ?? word('fromMemoryAccessId', text) ?? word('from', text), toMemoryAccessId: word('toAccess', text) ?? word('toAccessId', text) ?? word('toMemoryAccess', text) ?? word('toMemoryAccessId', text) ?? word('to', text), edgeKind: word('edgeKind', text) ?? word('synchronizationKind', text) ?? word('syncKind', text) ?? word('kind', text) ?? name, synchronizationKind: word('synchronizationKind', text) ?? word('syncKind', text) ?? word('edgeKind', text) ?? word('kind', text) ?? name, fenceKind: word('fenceKind', text), memoryScope: word('memoryScope', text) ?? word('barrierScope', text) ?? word('scope', text), memoryOrder: word('memoryOrder', text) ?? word('ordering', text), lockId: word('lock', text) ?? word('lockId', text), synchronizationKey: word('sync', text) ?? word('synchronizationKey', text), channelId: word('channel', text) ?? word('channelId', text), actorId: word('actor', text) ?? word('actorId', text), operationKind: word('operation', text) ?? word('operationKind', text), reasonCode: word('reasonCode', text) ?? word('code', text), condition: quoted('condition', text) ?? word('condition', text), status: word('status', text) ?? 'needs-proof', severity: word('severity', text) ?? 'error', proofStatus: word('proofStatus', text) ?? word('status', text) ?? 'missing', message: quoted('message', text), failClosed: common.failClosed ?? true, semanticEquivalenceClaim: false, runtimeEquivalenceClaim: false });
   if (kind === 'trap') return cleanRecord({ ...common, resourceId: word('resource', text) ?? word('resourceId', text), ownerId: word('owner', text) ?? word('ownerId', text), loanId: word('loan', text) ?? word('loanId', text), pointerEdgeId: word('pointer', text) ?? word('pointerEdge', text) ?? word('pointerEdgeId', text), memoryAccessId: word('memoryAccess', text) ?? word('memoryAccessId', text), unsafeBoundaryId: word('unsafeBoundary', text) ?? word('unsafeBoundaryId', text), operationKind: word('operation', text) ?? word('operationKind', text), instructionId: word('instruction', text) ?? word('instructionId', text), callableId: word('callable', text) ?? word('callableId', text), trapKind: word('trapKind', text) ?? word('kind', text) ?? name, trapCode: word('trapCode', text) ?? word('code', text), reasonCode: word('reasonCode', text) ?? word('code', text), condition: quoted('condition', text) ?? word('condition', text), status: word('status', text) ?? 'needs-proof', severity: word('severity', text) ?? 'error', proofStatus: word('proofStatus', text) ?? word('status', text) ?? 'missing', message: quoted('message', text), failClosed: common.failClosed ?? true, semanticEquivalenceClaim: false, runtimeEquivalenceClaim: false });
   if (kind === 'undefinedBehavior') return cleanRecord({ ...common, resourceId: word('resource', text) ?? word('resourceId', text), ownerId: word('owner', text) ?? word('ownerId', text), loanId: word('loan', text) ?? word('loanId', text), pointerEdgeId: word('pointer', text) ?? word('pointerEdge', text) ?? word('pointerEdgeId', text), memoryAccessId: word('memoryAccess', text) ?? word('memoryAccessId', text), unsafeBoundaryId: word('unsafeBoundary', text) ?? word('unsafeBoundaryId', text), operationKind: word('operation', text) ?? word('operationKind', text), undefinedBehaviorKind: word('undefinedBehaviorKind', text) ?? word('behaviorKind', text) ?? word('kind', text) ?? name, language: word('language', text), reasonCode: word('reasonCode', text) ?? word('code', text), condition: quoted('condition', text) ?? word('condition', text), status: word('status', text) ?? 'needs-proof', severity: word('severity', text) ?? 'error', proofStatus: word('proofStatus', text) ?? word('status', text) ?? 'missing', message: quoted('message', text), failClosed: common.failClosed ?? true, semanticEquivalenceClaim: false, runtimeEquivalenceClaim: false });
   return undefined;

package/dist/resource-graph.js

@@ -18,6 +18,7 @@ const GROUPS = {
   pointerEdge: 'pointerEdges',
   memoryAccess: 'memoryAccesses',
   abiBoundary: 'abiBoundaries',
+  synchronizationEdge: 'synchronizationEdges',
   trap: 'traps',
   undefinedBehavior: 'undefinedBehaviors',
   conflict: 'conflicts',
@@ -54,6 +55,7 @@ export function parseResourceGraphBlock(block) {
     pointerEdges: [],
     memoryAccesses: [],
     abiBoundaries: [],
+    synchronizationEdges: [],
     traps: [],
     undefinedBehaviors: [],
     conflicts: [],
@@ -84,6 +86,7 @@ export function parseResourceGraphBlock(block) {
   graph.outlives = graph.lifetimeRelations;
   graph.borrowScopeRegions = graph.borrowScopes;
   graph.summary = summarize(graph);
+  graph.status = deriveGraphStatus(graph.status, graph.summary);
   graph.query = {
     resourceIds: ids(graph.resources),
     ownerIds: ids(graph.owners),
@@ -91,10 +94,11 @@ export function parseResourceGraphBlock(block) {
     trapIds: ids(graph.traps),
     undefinedBehaviorIds: ids(graph.undefinedBehaviors),
     failClosedTrapIds: ids(graph.traps.filter((record) => record.failClosed)),
-    lowLevelPrimitiveIds: ids([...graph.memoryRegions, ...graph.dataLayouts, ...graph.pointerEdges, ...graph.memoryAccesses, ...graph.abiBoundaries, ...graph.traps, ...graph.undefinedBehaviors]),
+    synchronizationEdgeIds: ids(graph.synchronizationEdges),
+    lowLevelPrimitiveIds: ids([...graph.memoryRegions, ...graph.dataLayouts, ...graph.pointerEdges, ...graph.memoryAccesses, ...graph.abiBoundaries, ...graph.synchronizationEdges, ...graph.traps, ...graph.undefinedBehaviors]),
     sourcePaths: unique(allRecords(graph).map((record) => record.sourcePath)),
     evidenceIds: unique([...graph.evidenceIds, ...allRecords(graph).flatMap((record) => record.evidenceIds ?? [])]),
-    blockerReasonCodes: unique([...graph.conflicts, ...graph.traps, ...graph.undefinedBehaviors].map((record) => record.reasonCode))
+    blockerReasonCodes: blockerReasonCodes(graph)
   };
 
   return {
@@ -168,9 +172,10 @@ function summarize(graph) {
     pointerEdges: graph.pointerEdges.length,
     memoryAccesses: graph.memoryAccesses.length,
     abiBoundaries: graph.abiBoundaries.length,
+    synchronizationEdges: graph.synchronizationEdges.length,
     traps: graph.traps.length,
     undefinedBehaviors: graph.undefinedBehaviors.length,
-    lowLevelPrimitives: graph.memoryRegions.length + graph.dataLayouts.length + graph.pointerEdges.length + graph.memoryAccesses.length + graph.abiBoundaries.length + graph.traps.length + graph.undefinedBehaviors.length,
+    lowLevelPrimitives: graph.memoryRegions.length + graph.dataLayouts.length + graph.pointerEdges.length + graph.memoryAccesses.length + graph.abiBoundaries.length + graph.synchronizationEdges.length + graph.traps.length + graph.undefinedBehaviors.length,
     conflicts: graph.conflicts.length,
     proofObligations: graph.proofObligations.length,
     unsafeBoundariesWithoutProof: graph.unsafeBoundaries.filter((record) => record.proofStatus !== 'passed').length,
@@ -178,10 +183,27 @@ function summarize(graph) {
     trapsWithoutProof: graph.traps.filter((record) => record.proofStatus !== 'passed').length,
     undefinedBehaviorsWithoutProof: graph.undefinedBehaviors.filter((record) => record.proofStatus !== 'passed').length,
     parseErrors: graph.parser?.errors?.length ?? 0,
-    reasonCodes: unique([...graph.conflicts, ...graph.traps, ...graph.undefinedBehaviors].map((record) => record.reasonCode))
+    synchronizationEdgesWithoutProof: graph.synchronizationEdges.filter((record) => record.proofStatus !== 'passed').length,
+    reasonCodes: unique([...graph.conflicts, ...graph.synchronizationEdges, ...graph.traps, ...graph.undefinedBehaviors].map((record) => record.reasonCode))
   };
 }
 
+function deriveGraphStatus(authoredStatus, summary) {
+  if (
+    summary.conflicts > 0 ||
+    summary.unsafeBoundariesWithoutProof > 0 ||
+    summary.synchronizationEdgesWithoutProof > 0 ||
+    summary.trapsWithoutProof > 0 ||
+    summary.undefinedBehaviorsWithoutProof > 0
+  ) return 'blocked';
+  return authoredStatus ?? 'partial';
+}
+
+function blockerReasonCodes(graph) {
+  const unprovedSynchronizationEdges = graph.synchronizationEdges.filter((record) => record.proofStatus !== 'passed');
+  return unique([...graph.conflicts, ...unprovedSynchronizationEdges, ...graph.traps, ...graph.undefinedBehaviors].map((record) => record.reasonCode));
+}
+
 function allRecords(graph) {
   return [
     ...graph.resources,
@@ -200,6 +222,7 @@ function allRecords(graph) {
     ...graph.pointerEdges,
     ...graph.memoryAccesses,
     ...graph.abiBoundaries,
+    ...graph.synchronizationEdges,
     ...graph.traps,
     ...graph.undefinedBehaviors,
     ...graph.conflicts,
@@ -217,6 +240,7 @@ function normalizeRowKind(kind) {
   if (kind === 'pointer' || kind === 'ptr' || kind === 'address') return 'pointerEdge';
   if (kind === 'access' || kind === 'memoryAccess' || kind === 'atomic' || kind === 'volatile') return 'memoryAccess';
   if (kind === 'abi' || kind === 'abiBoundary' || kind === 'callBoundary') return 'abiBoundary';
+  if (kind === 'sync' || kind === 'synchronization' || kind === 'synchronisation' || kind === 'synchronizationEdge' || kind === 'synchronisationEdge' || kind === 'happensBefore' || kind === 'happens-before' || kind === 'hb' || kind === 'fence' || kind === 'fenceEdge' || kind === 'barrier' || kind === 'barrierEdge') return 'synchronizationEdge';
   if (kind === 'traps') return 'trap';
   if (kind === 'undefined' || kind === 'ub' || kind === 'undefinedBehavior' || kind === 'undefinedBehaviour') return 'undefinedBehavior';
   if (kind === 'proof' || kind === 'obligation' || kind === 'proofObligation') return 'proofObligation';
@@ -233,6 +257,7 @@ function recordKind(kind) {
   if (kind === 'pointerEdge') return 'pointer-edge';
   if (kind === 'memoryAccess') return 'memory-access';
   if (kind === 'abiBoundary') return 'abi-boundary';
+  if (kind === 'synchronizationEdge') return 'synchronization-edge';
   if (kind === 'undefinedBehavior') return 'undefined-behavior';
   if (kind === 'proofObligation') return 'proof-obligation';
   return kind;

package/dist/source-syntax-row-config.js

@@ -16,8 +16,8 @@ export const ROW_SYNTAX_CONFIG = Object.freeze({
   runtimeCapabilities: rowConfig('runtimeCapabilityRow', 'runtime_capability_row', runtimeRows, normalizeRuntimeCapabilityRow),
   runtimeCapabilityMatrix: rowConfig('runtimeCapabilityRow', 'runtime_capability_row', runtimeRows, normalizeRuntimeCapabilityRow),
   runtimeHosts: rowConfig('runtimeCapabilityRow', 'runtime_capability_row', runtimeRows, normalizeRuntimeCapabilityRow),
-  resourceGraph: rowConfig('resourceGraphRow', 'resource_graph_row', words('resource owner loan alias move drop escape lifetime lifetimeRegion life outlives lifetimeRelation lifeRelation borrow borrowScope borrowRegion unsafe unsafeBoundary memory memoryRegion region layout dataLayout pointer ptr address access memoryAccess atomic volatile abi abiBoundary callBoundary trap traps undefined undefinedBehavior undefinedBehaviour ub conflict proof proofObligation obligation'), normalizeResourceGraphRow),
-  semanticResourceGraph: rowConfig('resourceGraphRow', 'resource_graph_row', words('resource owner loan alias move drop escape lifetime lifetimeRegion life outlives lifetimeRelation lifeRelation borrow borrowScope borrowRegion unsafe unsafeBoundary memory memoryRegion region layout dataLayout pointer ptr address access memoryAccess atomic volatile abi abiBoundary callBoundary trap traps undefined undefinedBehavior undefinedBehaviour ub conflict proof proofObligation obligation'), normalizeResourceGraphRow),
+  resourceGraph: rowConfig('resourceGraphRow', 'resource_graph_row', words('resource owner loan alias move drop escape lifetime lifetimeRegion life outlives lifetimeRelation lifeRelation borrow borrowScope borrowRegion unsafe unsafeBoundary memory memoryRegion region layout dataLayout pointer ptr address access memoryAccess atomic volatile abi abiBoundary callBoundary sync synchronization synchronisation synchronizationEdge synchronisationEdge happensBefore hb fence fenceEdge barrier barrierEdge trap traps undefined undefinedBehavior undefinedBehaviour ub conflict proof proofObligation obligation'), normalizeResourceGraphRow),
+  semanticResourceGraph: rowConfig('resourceGraphRow', 'resource_graph_row', words('resource owner loan alias move drop escape lifetime lifetimeRegion life outlives lifetimeRelation lifeRelation borrow borrowScope borrowRegion unsafe unsafeBoundary memory memoryRegion region layout dataLayout pointer ptr address access memoryAccess atomic volatile abi abiBoundary callBoundary sync synchronization synchronisation synchronizationEdge synchronisationEdge happensBefore hb fence fenceEdge barrier barrierEdge trap traps undefined undefinedBehavior undefinedBehaviour ub conflict proof proofObligation obligation'), normalizeResourceGraphRow),
   applicationSurface: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
   appHost: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
   plugin: rowConfig('applicationSurfaceRow', 'application_surface_row', appRows, normalizeApplicationSurfaceRow),
@@ -84,6 +84,7 @@ function normalizeResourceGraphRow(rowKind) {
   if (rowKind === 'pointer' || rowKind === 'ptr' || rowKind === 'address') return 'pointerEdge';
   if (rowKind === 'access' || rowKind === 'atomic' || rowKind === 'volatile') return 'memoryAccess';
   if (rowKind === 'abi' || rowKind === 'callBoundary') return 'abiBoundary';
+  if (rowKind === 'sync' || rowKind === 'synchronization' || rowKind === 'synchronisation' || rowKind === 'synchronisationEdge' || rowKind === 'happensBefore' || rowKind === 'hb' || rowKind === 'fence' || rowKind === 'fenceEdge' || rowKind === 'barrier' || rowKind === 'barrierEdge') return 'synchronizationEdge';
   if (rowKind === 'traps') return 'trap';
   if (rowKind === 'undefined' || rowKind === 'undefinedBehaviour' || rowKind === 'ub') return 'undefinedBehavior';
   if (rowKind === 'proof' || rowKind === 'proofObligation') return 'obligation';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-parser",
-  "version": "0.3.73",
+  "version": "0.3.75",
   "description": "Parser for the first Frontier Lang .frontier syntax slice.",
   "type": "module",
   "main": "./dist/index.js",