implements PR-09.1: remove moduleKey from FE/BE contracts

This commit is contained in:
2026-03-24 13:42:33 +00:00
parent 98adb67bc0
commit 32ab6d7a76
17 changed files with 53 additions and 166 deletions
@@ -45,7 +45,6 @@ class GoldenArtifactsTest {
return IRBackend.builder()
.executableFunctions(ReadOnlyList.from(new IRBackendExecutableFunction(
new FileId(1),
"app/main",
"main",
new CallableId(0),
0,
@@ -58,15 +57,12 @@ class GoldenArtifactsTest {
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_HOST,
"",
"",
null,
new IRBackendExecutableFunction.HostCallMetadata("gfx", "draw_pixel", 1, 0, 0),
null,
Span.none()),
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_INTRINSIC,
"",
"",
null,
new IRBackendExecutableFunction.IntrinsicCallMetadata("input.pad", 1, new IntrinsicId(0)),
0,
@@ -75,7 +71,6 @@ class GoldenArtifactsTest {
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),
@@ -264,7 +264,6 @@ class LowerToIRVMServiceTest {
final ReadOnlyList<IRBackendExecutableFunction.Instruction> instructions) {
return new IRBackendExecutableFunction(
new FileId(0),
moduleKey,
name,
new CallableId(callableId),
0,
@@ -296,7 +295,6 @@ class LowerToIRVMServiceTest {
return new IRBackendExecutableFunction(
new FileId(0),
new ModuleId(moduleId),
moduleKey,
name,
new CallableId(callableId),
0,
@@ -313,7 +311,6 @@ class LowerToIRVMServiceTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none());
@@ -325,7 +322,7 @@ class LowerToIRVMServiceTest {
final int calleeCallableId) {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
moduleKey,
ModuleId.none(),
name,
new CallableId(calleeCallableId),
null,
@@ -341,7 +338,7 @@ class LowerToIRVMServiceTest {
final int expectedRetSlots) {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
moduleKey,
ModuleId.none(),
name,
new CallableId(calleeCallableId),
null,
@@ -360,7 +357,6 @@ class LowerToIRVMServiceTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_HOST,
"",
"",
new IRBackendExecutableFunction.HostCallMetadata(module, name, version, argSlots, retSlots),
null,
Span.none());
@@ -373,7 +369,6 @@ class LowerToIRVMServiceTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_INTRINSIC,
"",
"",
null,
new IRBackendExecutableFunction.IntrinsicCallMetadata(canonicalName, canonicalVersion, new IntrinsicId(intrinsicId)),
0,
@@ -384,7 +379,7 @@ class LowerToIRVMServiceTest {
private static IRBackendExecutableFunction.Instruction label(final String label) {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.LABEL,
"",
ModuleId.none(),
"",
null,
null,
@@ -399,7 +394,7 @@ class LowerToIRVMServiceTest {
private static IRBackendExecutableFunction.Instruction jmp(final String target) {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.JMP,
"",
ModuleId.none(),
"",
null,
null,
@@ -322,7 +322,6 @@ class OptimizeIRVMEquivalenceHarnessTest {
final ReadOnlyList<IRBackendExecutableFunction.Instruction> instructions) {
return new IRBackendExecutableFunction(
new FileId(1),
"app",
name,
new CallableId(callableId),
0,
@@ -339,8 +338,6 @@ class OptimizeIRVMEquivalenceHarnessTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
null,
Span.none());
@@ -355,8 +352,6 @@ class OptimizeIRVMEquivalenceHarnessTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_HOST,
"",
"",
null,
new IRBackendExecutableFunction.HostCallMetadata(module, name, version, argSlots, retSlots),
null,
Span.none());
@@ -371,7 +366,6 @@ class OptimizeIRVMEquivalenceHarnessTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_INTRINSIC,
"",
"",
null,
null,
new IRBackendExecutableFunction.IntrinsicCallMetadata(canonicalName, canonicalVersion, new IntrinsicId(intrinsicId)),
@@ -188,7 +188,6 @@ class BackendGateIIntegrationTest {
final ReadOnlyList<IRBackendExecutableFunction.Instruction> instructions) {
return new IRBackendExecutableFunction(
new FileId(1),
"app/main",
name,
new CallableId(1),
0,
@@ -205,7 +204,6 @@ class BackendGateIIntegrationTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none());
@@ -220,7 +218,6 @@ class BackendGateIIntegrationTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_HOST,
"",
"",
new IRBackendExecutableFunction.HostCallMetadata(module, name, version, argSlots, retSlots),
null,
Span.none());
@@ -233,7 +230,6 @@ class BackendGateIIntegrationTest {
return new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_INTRINSIC,
"",
"",
null,
new IRBackendExecutableFunction.IntrinsicCallMetadata(canonicalName, canonicalVersion, new IntrinsicId(intrinsicId)),
0,
@@ -28,7 +28,6 @@ class BackendSafetyGateSUTest {
final var backend = IRBackend.builder()
.executableFunctions(ReadOnlyList.from(new IRBackendExecutableFunction(
new FileId(1),
"app",
"main",
new CallableId(1),
0,
@@ -40,7 +39,7 @@ class BackendSafetyGateSUTest {
ReadOnlyList.from(
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
"app",
p.studio.compiler.source.identifiers.ModuleId.none(),
"missing",
new CallableId(99),
null,
@@ -51,7 +50,6 @@ class BackendSafetyGateSUTest {
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),
@@ -113,7 +111,6 @@ class BackendSafetyGateSUTest {
final var backend = IRBackend.builder()
.executableFunctions(ReadOnlyList.from(new IRBackendExecutableFunction(
new FileId(1),
"app",
"main",
new CallableId(1),
0,
@@ -125,7 +122,6 @@ class BackendSafetyGateSUTest {
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),
@@ -38,7 +38,6 @@ class LowerToIRVMPipelineStageTest {
ctx.irBackend = IRBackend.builder()
.executableFunctions(ReadOnlyList.from(new IRBackendExecutableFunction(
new FileId(0),
"app",
"main",
new CallableId(1),
0,
@@ -50,7 +49,6 @@ class LowerToIRVMPipelineStageTest {
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),
@@ -71,7 +69,6 @@ class LowerToIRVMPipelineStageTest {
ctx.irBackend = IRBackend.builder()
.executableFunctions(ReadOnlyList.from(new IRBackendExecutableFunction(
new FileId(0),
"app",
"main",
new CallableId(1),
0,
@@ -83,7 +80,6 @@ class LowerToIRVMPipelineStageTest {
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),
@@ -104,7 +100,6 @@ class LowerToIRVMPipelineStageTest {
ctx.irBackend = IRBackend.builder()
.executableFunctions(ReadOnlyList.from(new IRBackendExecutableFunction(
new FileId(9),
"app",
"main",
new CallableId(1),
10,
@@ -116,7 +111,7 @@ class LowerToIRVMPipelineStageTest {
ReadOnlyList.from(
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
"app",
p.studio.compiler.source.identifiers.ModuleId.none(),
"missing",
new CallableId(99),
null,
@@ -125,7 +120,6 @@ class LowerToIRVMPipelineStageTest {
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),
@@ -149,7 +143,6 @@ class LowerToIRVMPipelineStageTest {
.executableFunctions(ReadOnlyList.from(
new IRBackendExecutableFunction(
new FileId(0),
"app",
"callee",
new CallableId(2),
0,
@@ -161,14 +154,12 @@ class LowerToIRVMPipelineStageTest {
ReadOnlyList.from(new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),
Span.none()),
new IRBackendExecutableFunction(
new FileId(0),
"app",
"main",
new CallableId(1),
0,
@@ -180,7 +171,7 @@ class LowerToIRVMPipelineStageTest {
ReadOnlyList.from(
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
"app",
p.studio.compiler.source.identifiers.ModuleId.none(),
"callee",
new CallableId(2),
null,
@@ -191,7 +182,6 @@ class LowerToIRVMPipelineStageTest {
new IRBackendExecutableFunction.Instruction(
IRBackendExecutableFunction.InstructionKind.RET,
"",
"",
null,
null,
Span.none())),