Skip to content

Commit

Permalink
BREAKING(std/wasi): return exit code from start (denoland/deno#9022)
Browse files Browse the repository at this point in the history
This returns the exit code directly from the start entry point instead
of throwing it and letting the user handle it.

As a result the exit status is an implementation detail and has been
made internal.
  • Loading branch information
caspervonb authored Jan 6, 2021
1 parent a28e7f6 commit 7c16a24
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 9 deletions.
16 changes: 13 additions & 3 deletions wasi/snapshot_preview1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ interface FileDescriptor {
entries?: Deno.DirEntry[];
}

export class ExitStatus {
class ExitStatus {
code: number;

constructor(code: number) {
Expand Down Expand Up @@ -1656,7 +1656,7 @@ export default class Context {
* which will be used as the address space, if it does not an error will be
* thrown.
*/
start(instance: WebAssembly.Instance) {
start(instance: WebAssembly.Instance): null | number | never {
if (this.#started) {
throw new Error("WebAssembly.Instance has already started");
}
Expand All @@ -1683,7 +1683,17 @@ export default class Context {
);
}

_start();
try {
_start();
} catch (err) {
if (err instanceof ExitStatus) {
return err.code;
}

throw err;
}

return null;
}

/**
Expand Down
24 changes: 18 additions & 6 deletions wasi/snapshot_preview1_test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import Context, { ExitStatus } from "./snapshot_preview1.ts";
import Context from "./snapshot_preview1.ts";
import { assert, assertEquals, assertThrows } from "../testing/asserts.ts";
import { copy } from "../fs/mod.ts";
import * as path from "../path/mod.ts";
Expand Down Expand Up @@ -181,11 +181,25 @@ Deno.test("context_start", function () {
"export _start must be a function",
);

try {
{
const context = new Context({
exitOnReturn: false,
});
context.start({
const exitCode = context.start({
exports: {
_start() {
},
memory: new WebAssembly.Memory({ initial: 1 }),
},
});
assertEquals(exitCode, null);
}

{
const context = new Context({
exitOnReturn: false,
});
const exitCode = context.start({
exports: {
_start() {
const exit = context.exports["proc_exit"] as CallableFunction;
Expand All @@ -194,9 +208,7 @@ Deno.test("context_start", function () {
memory: new WebAssembly.Memory({ initial: 1 }),
},
});
} catch (err) {
assert(err instanceof ExitStatus);
assertEquals(err.code, 0);
assertEquals(exitCode, 0);
}

assertThrows(
Expand Down

0 comments on commit 7c16a24

Please sign in to comment.