fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-04-26 07:22:21 +00:00
Code Issues Projects Releases Wiki Activity

Emit proper diagnostic when returning void from a function with a return value, fixes #475

Browse Source
This commit is contained in:
dcode 2019-02-08 16:00:35 +01:00
parent fadfe6e421
commit e623786b42
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler.ts
View File

@ -1948,12 +1948,12 @@ export class Compiler extends DiagnosticEmitter {
var module = this.module; var module = this.module;
var expr: ExpressionRef = 0; var expr: ExpressionRef = 0;
var flow = this.currentFlow; var flow = this.currentFlow;
var returnType = flow.returnType;
// Remember that this flow returns // Remember that this flow returns
flow.set(FlowFlags.RETURNS); flow.set(FlowFlags.RETURNS);
if (statement.value) { if (statement.value) {
let returnType = flow.returnType;
if (returnType == Type.void) { if (returnType == Type.void) {
this.compileExpressionRetainType(statement.value, returnType, WrapMode.NONE); this.compileExpressionRetainType(statement.value, returnType, WrapMode.NONE);
this.error( this.error(
@ -1974,6 +1974,13 @@ export class Compiler extends DiagnosticEmitter {
// Remember whether returning a properly wrapped value // Remember whether returning a properly wrapped value
if (!flow.canOverflow(expr, returnType)) flow.set(FlowFlags.RETURNS_WRAPPED); if (!flow.canOverflow(expr, returnType)) flow.set(FlowFlags.RETURNS_WRAPPED);
} else if (returnType != Type.void) {
this.error(
DiagnosticCode.Type_0_is_not_assignable_to_type_1,
statement.range, "void", returnType.toString()
);
expr = module.createUnreachable();
} }
// If the last statement anyway, make it the block's return value // If the last statement anyway, make it the block's return value