From 3988b64762f7b45a766275f77f73823a2c03c3ef Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 25 Jun 2023 16:01:37 +0100 Subject: Clarify shed locals in LlvmCodeGenContext --- .../compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java | 6 +++--- .../shedlang/compiler/backends/llvm/LlvmCodeGenLocalLoadTests.java | 4 ++-- .../shedlang/compiler/backends/llvm/LlvmCodeGenLocalStoreTests.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java index f0e3cf23..fdebce5f 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java @@ -66,7 +66,7 @@ public class LlvmCodeGenDefineFunctionTests { assertThat(result.stack(), isSequence( isLlvmVariableLocal("closureValue__0") )); - assertThat(result.locals().entrySet(), isSequence()); + assertThat(result.shedLocalNameToOperand().entrySet(), isSequence()); } @Test @@ -83,8 +83,8 @@ public class LlvmCodeGenDefineFunctionTests { Sources.NULL ); var context = LlvmCodeGenContext.EMPTY - .addLocal("a", LlvmIr.operandInt(1)) - .addLocal("b", LlvmIr.operandInt(2)); + .addShedLocal("a", LlvmIr.operandInt(1)) + .addShedLocal("b", LlvmIr.operandInt(2)); var result = LlvmCodeGen.generateInstruction(instruction, context); diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalLoadTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalLoadTests.java index 487e184e..6dedfd11 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalLoadTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalLoadTests.java @@ -17,13 +17,13 @@ public class LlvmCodeGenLocalLoadTests { public void localLoadPushsOperandFromLocalsToStack() { var instruction = Instructions.localLoad("x"); var context = LlvmCodeGenContext.EMPTY - .addLocal("x", LlvmIr.operandInt(42)); + .addShedLocal("x", LlvmIr.operandInt(42)); var result = LlvmCodeGen.generateInstruction(instruction, context); assertThat(result.instructions(), isSequence()); assertThat(result.stack(), isSequence(isLlvmOperandInt(42))); - assertThat(result.locals().entrySet(), isSequence(isLocal("x", isLlvmOperandInt(42)))); + assertThat(result.shedLocalNameToOperand().entrySet(), isSequence(isLocal("x", isLlvmOperandInt(42)))); } private static Matcher> isLocal(String name, Matcher operand) { diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalStoreTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalStoreTests.java index 1461db1b..814e7238 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalStoreTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenLocalStoreTests.java @@ -24,7 +24,7 @@ public class LlvmCodeGenLocalStoreTests { assertThat(result.instructions(), isSequence()); assertThat(result.stack(), isSequence(isLlvmOperandInt(0))); - assertThat(result.locals().entrySet(), isSequence(isLocal("x", isLlvmOperandInt(1)))); + assertThat(result.shedLocalNameToOperand().entrySet(), isSequence(isLocal("x", isLlvmOperandInt(1)))); } private static Matcher> isLocal(String name, Matcher operand) { -- cgit v1.2.3