Scaffolding for LogicalTerminal

facebook · Jan 10, 2023 · a4fc975 · a4fc975
1 parent f9ecc96
commit a4fc975
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 1 deletion.
diff --git a/compiler/forget/src/HIR/HIR.ts b/compiler/forget/src/HIR/HIR.ts
@@ -162,7 +162,8 @@ export type Terminal =
   | IfTerminal
   | SwitchTerminal
   | ForTerminal
-  | WhileTerminal;
+  | WhileTerminal
+  | LogicalTerminal;
 
 /**
  * Terminal nodes allowed for a value block
@@ -226,6 +227,14 @@ export type ForTerminal = {
   id: InstructionId;
 };
 
+export type LogicalTerminal = {
+  kind: "logical";
+  operator: t.LogicalExpression["operator"];
+  test: BlockId;
+  fallthrough: BlockId;
+  id: InstructionId;
+};
+
 /**
  * Instructions generally represent expressions but with all nesting flattened away,
  * such that all operands to each instruction are either primitive values OR are

diff --git a/compiler/forget/src/HIR/HIRBuilder.ts b/compiler/forget/src/HIR/HIRBuilder.ts
@@ -503,6 +503,10 @@ export function reversePostorderBlocks(func: HIR): void {
         }
         break;
       }
+      case "logical": {
+        visit(terminal.test);
+        break;
+      }
       case "while": {
         visit(terminal.test);
         break;

diff --git a/compiler/forget/src/HIR/HIRTreeVisitor.ts b/compiler/forget/src/HIR/HIRTreeVisitor.ts
@@ -6,6 +6,7 @@
  */
 
 import invariant from "invariant";
+import todo from "../Utils/todo";
 import { assertExhaustive } from "../Utils/utils";
 import {
   BasicBlock,
@@ -445,6 +446,9 @@ class Driver<
         }
         break;
       }
+      case "logical": {
+        todo("Implement tree visitor for logical terminal");
+      }
       case "goto": {
         this.visitor.visitTerminalId(terminal.id);
         switch (terminal.variant) {

diff --git a/compiler/forget/src/HIR/PrintHIR.ts b/compiler/forget/src/HIR/PrintHIR.ts
@@ -79,6 +79,7 @@ export function printMixedHIR(
   }
   switch (value.kind) {
     case "if":
+    case "logical":
     case "return":
     case "switch":
     case "throw":
@@ -135,6 +136,10 @@ export function printTerminal(terminal: Terminal): Array<string> | string {
       }`;
       break;
     }
+    case "logical": {
+      value = `[${terminal.id}] Logical ${terminal.operator} test:bb${terminal.test} fallthrough=bb${terminal.fallthrough}`;
+      break;
+    }
     case "throw": {
       value = `[${terminal.id}] Throw ${printPlace(terminal.value)}`;
       break;

diff --git a/compiler/forget/src/HIR/visitors.ts b/compiler/forget/src/HIR/visitors.ts
@@ -241,6 +241,17 @@ export function mapTerminalSuccessors(
         id: makeInstructionId(0),
       };
     }
+    case "logical": {
+      const test = fn(terminal.test);
+      const fallthrough = fn(terminal.fallthrough);
+      return {
+        kind: "logical",
+        test,
+        fallthrough,
+        operator: terminal.operator,
+        id: makeInstructionId(0),
+      };
+    }
     case "return": {
       return {
         kind: "return",
@@ -312,6 +323,10 @@ export function* eachTerminalSuccessor(terminal: Terminal): Iterable<BlockId> {
       }
       break;
     }
+    case "logical": {
+      yield terminal.test;
+      break;
+    }
     case "return": {
       break;
     }
@@ -361,6 +376,7 @@ export function mapTerminalOperands(
       }
       break;
     }
+    case "logical":
     case "while":
     case "for":
     case "goto": {
@@ -399,6 +415,7 @@ export function* eachTerminalOperand(terminal: Terminal): Iterable<Place> {
       }
       break;
     }
+    case "logical":
     case "while":
     case "for":
     case "goto": {

diff --git a/compiler/forget/src/Utils/VisualizeHIRMermaid.ts b/compiler/forget/src/Utils/VisualizeHIRMermaid.ts
@@ -95,6 +95,10 @@ function printTerminalLabel(terminal: Terminal): string {
     case "throw":
       buffer.push(`Throw ${printPlace(terminal.value)}`);
       break;
+    case "logical": {
+      buffer.push(`Logical ${terminal.operator}`);
+      break;
+    }
     case "while":
       buffer.push("While");
       break;
@@ -123,6 +127,11 @@ function printTerminalArrows(blockId: BlockId, terminal: Terminal): string {
       }
       break;
     }
+    case "logical": {
+      buffer.push(printJumpArrow(blockId, terminal.test, "test"));
+      buffer.push(printJumpArrow(blockId, terminal.fallthrough, "fallthrough"));
+      break;
+    }
     case "goto": {
       buffer.push(printJumpArrow(blockId, terminal.block, null));
       break;