Skip to content

Add a crash handler to asc #1764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 29, 2021
Merged

Add a crash handler to asc #1764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bbab3b
Add a crash handler to asc
dcodeIO Mar 28, 2021
d319d9d
more
dcodeIO Mar 29, 2021
35db2ec
minor stuff
dcodeIO Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 114 additions & 27 deletions cli/asc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@
const fs = require("fs");
const path = require("path");
const process = require("process"); // ensure shim

process.exit = ((exit) => function(code) {
if (code) console.log(new Error("exit " + code.toString()).stack);
exit(code);
})(process.exit);

const utf8 = require("./util/utf8");
const colorsUtil = require("./util/colors");
const optionsUtil = require("./util/options");
Expand Down Expand Up @@ -795,7 +789,11 @@ exports.main = function main(argv, options, callback) {
// Pre-emptively initialize the program
stats.initializeCount++;
stats.initializeTime += measure(() => {
assemblyscript.initializeProgram(program);
try {
assemblyscript.initializeProgram(program);
} catch (e) {
crash("initialize", e);
}
});

// Call afterInitialize transform hook
Expand All @@ -807,7 +805,11 @@ exports.main = function main(argv, options, callback) {
var module;
stats.compileCount++;
stats.compileTime += measure(() => {
module = assemblyscript.compile(program);
try {
module = assemblyscript.compile(program);
} catch (e) {
crash("compile", e);
}
// From here on we are going to use Binaryen.js, except that we keep pass
// order as defined in the compiler.
if (typeof module === "number") { // Wasm
Expand Down Expand Up @@ -877,23 +879,50 @@ exports.main = function main(argv, options, callback) {
}
if (opts.runPasses.length) {
opts.runPasses.forEach(pass => {
if (runPasses.indexOf(pass = pass.trim()) < 0)
if (runPasses.indexOf(pass = pass.trim()) < 0) {
runPasses.push(pass);
}
});
}
}

stats.optimizeTime += measure(() => {
stats.optimizeCount++;
module.optimize(optimizeLevel, shrinkLevel, debugInfo);
module.runPasses(runPasses);
try {
module.optimize(optimizeLevel, shrinkLevel, debugInfo);
} catch (e) {
crash("optimize", e);
}
try {
module.runPasses(runPasses);
} catch (e) {
crash("runPasses", e);
}
if (converge) {
let last = module.emitBinary();
let last;
try {
last = module.emitBinary();
} catch (e) {
crash("emitBinary (converge)", e);
}
do {
stats.optimizeCount++;
module.optimize(optimizeLevel, shrinkLevel, debugInfo);
module.runPasses(runPasses);
let next = module.emitBinary();
try {
module.optimize(optimizeLevel, shrinkLevel, debugInfo);
} catch (e) {
crash("optimize (converge)", e);
}
try {
module.runPasses(runPasses);
} catch (e) {
crash("runPasses (converge)", e);
}
let next;
try {
next = module.emitBinary();
} catch (e) {
crash("emitBinary (converge)", e);
}
if (next.length >= last.length) {
if (next.length > last.length) {
stderr.write("Last converge was suboptimial." + EOL);
Expand Down Expand Up @@ -936,7 +965,11 @@ exports.main = function main(argv, options, callback) {
let wasm;
stats.emitCount++;
stats.emitTime += measure(() => {
wasm = module.emitBinary(sourceMapURL);
try {
wasm = module.emitBinary(sourceMapURL);
} catch (e) {
crash("emitBinary", e);
}
});

if (opts.binaryFile.length) {
Expand Down Expand Up @@ -977,17 +1010,25 @@ exports.main = function main(argv, options, callback) {
let wastFormat = opts.textFile.endsWith('.wast');
stats.emitCount++;
stats.emitTime += measure(() => {
if (wastFormat) {
out = module.emitText();
} else {
out = module.emitStackIR(true);
try {
if (wastFormat) {
out = module.emitText();
} else {
out = module.emitStackIR(true);
}
} catch (e) {
crash("emitText", e);
}
});
writeFile(opts.textFile, out, baseDir);
} else if (!hasStdout) {
stats.emitCount++;
stats.emitTime += measure(() => {
out = module.emitStackIR(true);
try {
out = module.emitStackIR(true);
} catch (e) {
crash("emitText", e);
}
});
writeStdout(out);
}
Expand All @@ -999,13 +1040,21 @@ exports.main = function main(argv, options, callback) {
if (opts.idlFile.length) {
stats.emitCount++;
stats.emitTime += measure(() => {
idl = assemblyscript.buildIDL(program);
try {
idl = assemblyscript.buildIDL(program);
} catch (e) {
crash("buildIDL", e);
}
});
writeFile(opts.idlFile, __getString(idl), baseDir);
} else if (!hasStdout) {
stats.emitCount++;
stats.emitTime += measure(() => {
idl = assemblyscript.buildIDL(program);
try {
idl = assemblyscript.buildIDL(program);
} catch (e) {
crash("buildIDL", e);
}
});
writeStdout(__getString(idl));
hasStdout = true;
Expand All @@ -1018,13 +1067,21 @@ exports.main = function main(argv, options, callback) {
if (opts.tsdFile.length) {
stats.emitCount++;
stats.emitTime += measure(() => {
tsd = assemblyscript.buildTSD(program);
try {
tsd = assemblyscript.buildTSD(program);
} catch (e) {
crash("buildTSD", e);
}
});
writeFile(opts.tsdFile, __getString(tsd), baseDir);
} else if (!hasStdout) {
stats.emitCount++;
stats.emitTime += measure(() => {
tsd = assemblyscript.buildTSD(program);
try {
tsd = assemblyscript.buildTSD(program);
} catch (e) {
crash("buildTSD", e);
}
});
writeStdout(__getString(tsd));
hasStdout = true;
Expand All @@ -1037,13 +1094,21 @@ exports.main = function main(argv, options, callback) {
if (opts.jsFile.length) {
stats.emitCount++;
stats.emitTime += measure(() => {
js = module.emitAsmjs();
try {
js = module.emitAsmjs();
} catch (e) {
crash("emitJS", e);
}
});
writeFile(opts.jsFile, js, baseDir);
} else if (!hasStdout) {
stats.emitCount++;
stats.emitTime += measure(() => {
js = module.emitAsmjs();
try {
js = module.emitAsmjs();
} catch (e) {
crash("emitJS", e);
}
});
writeStdout(js);
}
Expand Down Expand Up @@ -1332,3 +1397,25 @@ exports.tscOptions = {
types: [],
allowJs: false
};

// Gracefully handle crashes
function crash(stage, e) {
const BAR = colorsUtil.red("▌ ");
console.error([
EOL,
BAR, "Whoops, the AssemblyScript compiler has crashed during ", stage, " :-(", EOL,
BAR, EOL,
BAR, "Here is a stack trace that may or may not be useful:", EOL,
BAR, EOL,
e.stack.replace(/^/mg, BAR), EOL,
BAR, EOL,
BAR, "If it refers to the dist files, try to 'npm install source-map-support' and", EOL,
BAR, "run again, which should then show the actual code location in the sources.", EOL,
BAR, EOL,
BAR, "If you see where the error is, feel free to send us a pull request. If not,", EOL,
BAR, "please let us know: https://github.com/AssemblyScript/assemblyscript/issues", EOL,
BAR, EOL,
BAR, "Thank you!", EOL
].join(""));
process.exit(1);
}
5 changes: 4 additions & 1 deletion cli/shim/process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ module.exports = {
return 0;
},
hrtime,
argv: []
argv: [],
exit(code = 0) {
throw Error(`exit ${code}`);
}
};

// https://github.com/kumavis/browser-process-hrtime v1.0.0
Expand Down