implements PR-O1.4
This commit is contained in:
+27
-4
@@ -158,6 +158,17 @@ public final class PbsFrontendCompiler {
|
||||
intrinsicByMethodName.put(intrinsicSurface.sourceMethodName(), intrinsicSurface);
|
||||
}
|
||||
}
|
||||
final var returnSlotsByCallableAndArity = new HashMap<String, Integer>();
|
||||
for (final var declaredFn : ast.functions()) {
|
||||
final var key = callableArityKey(declaredFn.name(), declaredFn.parameters().size());
|
||||
final var retSlots = returnSlotsFor(declaredFn);
|
||||
if (returnSlotsByCallableAndArity.containsKey(key)
|
||||
&& !returnSlotsByCallableAndArity.get(key).equals(retSlots)) {
|
||||
returnSlotsByCallableAndArity.put(key, null);
|
||||
} else {
|
||||
returnSlotsByCallableAndArity.put(key, retSlots);
|
||||
}
|
||||
}
|
||||
|
||||
final var executableFunctions = new ArrayList<IRBackendExecutableFunction>(ast.functions().size());
|
||||
for (final var fn : ast.functions()) {
|
||||
@@ -221,6 +232,8 @@ public final class PbsFrontendCompiler {
|
||||
calleeName,
|
||||
null,
|
||||
null,
|
||||
callExpr.arguments().size(),
|
||||
returnSlotsByCallableAndArity.get(callableArityKey(calleeName, callExpr.arguments().size())),
|
||||
callExpr.span()));
|
||||
}
|
||||
instructions.add(new IRBackendExecutableFunction.Instruction(
|
||||
@@ -231,10 +244,7 @@ public final class PbsFrontendCompiler {
|
||||
null,
|
||||
fn.span()));
|
||||
|
||||
final var returnSlots = switch (fn.returnKind()) {
|
||||
case INFERRED_UNIT, EXPLICIT_UNIT -> 0;
|
||||
case PLAIN, RESULT -> 1;
|
||||
};
|
||||
final var returnSlots = returnSlotsFor(fn);
|
||||
final var start = safeToInt(fn.span().getStart());
|
||||
final var end = safeToInt(fn.span().getEnd());
|
||||
executableFunctions.add(new IRBackendExecutableFunction(
|
||||
@@ -259,6 +269,19 @@ public final class PbsFrontendCompiler {
|
||||
return (canonicalName + "#" + canonicalVersion).hashCode();
|
||||
}
|
||||
|
||||
private int returnSlotsFor(final PbsAst.FunctionDecl functionDecl) {
|
||||
return switch (functionDecl.returnKind()) {
|
||||
case INFERRED_UNIT, EXPLICIT_UNIT -> 0;
|
||||
case PLAIN, RESULT -> 1;
|
||||
};
|
||||
}
|
||||
|
||||
private String callableArityKey(
|
||||
final String callableName,
|
||||
final int arity) {
|
||||
return callableName + "#" + arity;
|
||||
}
|
||||
|
||||
private int safeToInt(final long value) {
|
||||
if (value > Integer.MAX_VALUE) {
|
||||
return Integer.MAX_VALUE;
|
||||
|
||||
Reference in New Issue
Block a user