Skip to content

Commit bfab2bd

Browse files
DuncanUszkay1DuncanUszkay1
authored
Merge pull request #14 from DuncanUszkay1/fix-remaining-small-ci-issues
Got CI working again (Correctly identifies everything that is failing)
2 parents df425d0 + 5a054f2 commit bfab2bd

26 files changed

+121
-102
lines changed

‎cli/asc.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,12 +653,16 @@ exports.main = function main(argv, options, callback) {
653653
// Validate the module if requested
654654
if (!args.noValidate) {
655655
stats.validateCount++;
656+
let callbackErrorResponse;
656657
stats.validateTime += measure(() => {
657658
if (!module.validate()) {
658659
module.dispose();
659-
return callback(Error("Validate error"));
660+
callbackErrorResponse = callback(Error("Validate error"));
660661
}
661662
});
663+
if (callbackErrorResponse) {
664+
return callbackErrorResponse;
665+
}
662666
}
663667

664668
// Set Binaryen-specific options

‎src/compiler.ts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8234,10 +8234,11 @@ export class Compiler extends DiagnosticEmitter {
82348234
assert(!declaration.typeParameters); // function expression cannot be generic
82358235
var flow = this.currentFlow;
82368236
var actualFunction = flow.actualFunction;
8237+
var anonymousFunctionName = declaration.name.text.length
8238+
? declaration.name.text
8239+
: "~anonymous|" + (actualFunction.nextAnonymousId++).toString();
82378240
var prototype = new FunctionPrototype(
8238-
declaration.name.text.length
8239-
? declaration.name.text
8240-
: "anonymous|" + (actualFunction.nextAnonymousId++).toString(),
8241+
anonymousFunctionName,
82418242
actualFunction,
82428243
declaration,
82438244
DecoratorFlags.NONE
@@ -8599,8 +8600,14 @@ export class Compiler extends DiagnosticEmitter {
85998600
if (!originalFunctionInstance || !this.compileFunction(originalFunctionInstance)) return module.unreachable();
86008601

86018602
// Create a new closure function for our original function
8603+
// TODO: Figure out why recursive closures don't work.
8604+
let anonymousFunctionName = functionPrototype.name + "~anonymous|" + (actualFunction.nextAnonymousId++).toString();
8605+
// Check if we are recursively calling the original actual function from our closure
8606+
if (actualFunction.name.includes( functionPrototype.name + "~anonymous|")) {
8607+
// anonymousFunctionName += "~recursive|" + (Function.nextAnonymousRecursiveId++).toString();
8608+
}
86028609
let closureFunctionInstance = new Function(
8603-
functionPrototype.name + "~anonymous|" + (actualFunction.nextAnonymousId++).toString(),
8610+
anonymousFunctionName,
86048611
functionPrototype,
86058612
null,
86068613
originalFunctionInstance.signature.toClosureSignature(),

‎src/program.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3477,6 +3477,7 @@ export class Function extends TypedElement {
34773477
nextInlineId: i32 = 0;
34783478
/** Counting id of anonymous inner functions. */
34793479
nextAnonymousId: i32 = 0;
3480+
static nextAnonymousRecursiveId: i32 = 0;
34803481
/** Counting id of autorelease variables. */
34813482
nextAutoreleaseId: i32 = 0;
34823483

‎tests/compiler/builtins.untouched.wat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
(data (i32.const 704) "\08\00\00\00\01\00\00\00\01\00\00\00\08\00\00\00v\00o\00i\00d\00")
3535
(data (i32.const 736) "\14\00\00\00\01\00\00\00\01\00\00\00\14\00\00\00s\00o\00m\00e\00 \00v\00a\00l\00u\00e\00")
3636
(table $0 3 funcref)
37-
(elem (i32.const 1) $start:builtins~anonymous|0 $start:builtins~anonymous|1)
37+
(elem (i32.const 1) $start:builtins~~anonymous|0 $start:builtins~~anonymous|1)
3838
(global $builtins/b (mut i32) (i32.const 0))
3939
(global $builtins/i (mut i32) (i32.const 0))
4040
(global $builtins/I (mut i64) (i64.const 0))
@@ -313,7 +313,7 @@
313313
call $~lib/rt/stub/__release
314314
local.get $2
315315
)
316-
(func $start:builtins~anonymous|0 (param $0 i32)
316+
(func $start:builtins~~anonymous|0 (param $0 i32)
317317
nop
318318
)
319319
(func $~lib/rt/stub/maybeGrowMemory (param $0 i32)
@@ -425,7 +425,7 @@
425425
i32.store offset=12
426426
local.get $2
427427
)
428-
(func $start:builtins~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
428+
(func $start:builtins~~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
429429
nop
430430
)
431431
(func $start:builtins

‎tests/compiler/closure-common-js-patterns.optimized.wat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
(data (i32.const 1184) ":\00\00\00\01\00\00\00\01\00\00\00:\00\00\00c\00l\00o\00s\00u\00r\00e\00-\00c\00o\00m\00m\00o\00n\00-\00j\00s\00-\00p\00a\00t\00t\00e\00r\00n\00s\00.\00t\00s")
1717
(data (i32.const 1264) "\04\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00 ")
1818
(table $0 6 funcref)
19-
(elem (i32.const 1) $start:closure-common-js-patterns~anonymous|0 $start:closure-common-js-patterns~anonymous|1~anonymous|0 $start:closure-common-js-patterns~anonymous|1 $start:closure-common-js-patterns~anonymous|2~anonymous|0 $start:closure-common-js-patterns~anonymous|2)
19+
(elem (i32.const 1) $start:closure-common-js-patterns~~anonymous|0 $start:closure-common-js-patterns~~anonymous|1~~anonymous|0 $start:closure-common-js-patterns~~anonymous|1 $start:closure-common-js-patterns~~anonymous|2~~anonymous|0 $start:closure-common-js-patterns~~anonymous|2)
2020
(global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
2121
(global $~lib/rt/tlsf/collectLock (mut i32) (i32.const 0))
2222
(global $closure-common-js-patterns/myData (mut i32) (i32.const 0))
@@ -1104,15 +1104,15 @@
11041104
call $~lib/rt/pure/decrement
11051105
end
11061106
)
1107-
(func $start:closure-common-js-patterns~anonymous|0 (param $0 i32) (result i32)
1107+
(func $start:closure-common-js-patterns~~anonymous|0 (param $0 i32) (result i32)
11081108
i32.const 1
11091109
)
1110-
(func $start:closure-common-js-patterns~anonymous|1~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
1110+
(func $start:closure-common-js-patterns~~anonymous|1~~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
11111111
local.get $1
11121112
i32.const 1
11131113
i32.add
11141114
)
1115-
(func $start:closure-common-js-patterns~anonymous|1 (param $0 i32) (result i32)
1115+
(func $start:closure-common-js-patterns~~anonymous|1 (param $0 i32) (result i32)
11161116
(local $1 i32)
11171117
i32.const 8
11181118
i32.const 3
@@ -1142,13 +1142,13 @@
11421142
call $~lib/rt/pure/__release
11431143
local.get $0
11441144
)
1145-
(func $start:closure-common-js-patterns~anonymous|2~anonymous|0 (param $0 i32) (result i32)
1145+
(func $start:closure-common-js-patterns~~anonymous|2~~anonymous|0 (param $0 i32) (result i32)
11461146
local.get $0
11471147
i32.load offset=4
11481148
i32.const 24
11491149
i32.add
11501150
)
1151-
(func $start:closure-common-js-patterns~anonymous|2 (param $0 i32) (param $1 i32) (result i32)
1151+
(func $start:closure-common-js-patterns~~anonymous|2 (param $0 i32) (param $1 i32) (result i32)
11521152
i32.const 8
11531153
i32.const 0
11541154
call $~lib/rt/tlsf/__alloc

‎tests/compiler/closure-common-js-patterns.untouched.wat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
(data (i32.const 176) ":\00\00\00\01\00\00\00\01\00\00\00:\00\00\00c\00l\00o\00s\00u\00r\00e\00-\00c\00o\00m\00m\00o\00n\00-\00j\00s\00-\00p\00a\00t\00t\00e\00r\00n\00s\00.\00t\00s\00")
1717
(data (i32.const 256) "\04\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00")
1818
(table $0 6 funcref)
19-
(elem (i32.const 1) $start:closure-common-js-patterns~anonymous|0 $start:closure-common-js-patterns~anonymous|1~anonymous|0 $start:closure-common-js-patterns~anonymous|1 $start:closure-common-js-patterns~anonymous|2~anonymous|0 $start:closure-common-js-patterns~anonymous|2)
19+
(elem (i32.const 1) $start:closure-common-js-patterns~~anonymous|0 $start:closure-common-js-patterns~~anonymous|1~~anonymous|0 $start:closure-common-js-patterns~~anonymous|1 $start:closure-common-js-patterns~~anonymous|2~~anonymous|0 $start:closure-common-js-patterns~~anonymous|2)
2020
(global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
2121
(global $~lib/ASC_LOW_MEMORY_LIMIT i32 (i32.const 0))
2222
(global $~lib/rt/tlsf/collectLock (mut i32) (i32.const 0))
@@ -1536,10 +1536,10 @@
15361536
call $~lib/rt/pure/decrement
15371537
end
15381538
)
1539-
(func $start:closure-common-js-patterns~anonymous|0 (param $0 i32) (result i32)
1539+
(func $start:closure-common-js-patterns~~anonymous|0 (param $0 i32) (result i32)
15401540
i32.const 1
15411541
)
1542-
(func $start:closure-common-js-patterns~anonymous|1~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
1542+
(func $start:closure-common-js-patterns~~anonymous|1~~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
15431543
local.get $1
15441544
i32.const 1
15451545
i32.add
@@ -1562,7 +1562,7 @@
15621562
i32.store offset=4
15631563
local.get $0
15641564
)
1565-
(func $start:closure-common-js-patterns~anonymous|1 (param $0 i32) (result i32)
1565+
(func $start:closure-common-js-patterns~~anonymous|1 (param $0 i32) (result i32)
15661566
(local $1 i32)
15671567
(local $2 i32)
15681568
(local $3 i32)
@@ -1593,13 +1593,13 @@
15931593
call $~lib/rt/pure/__release
15941594
local.get $3
15951595
)
1596-
(func $start:closure-common-js-patterns~anonymous|2~anonymous|0 (param $0 i32) (result i32)
1596+
(func $start:closure-common-js-patterns~~anonymous|2~~anonymous|0 (param $0 i32) (result i32)
15971597
i32.const 24
15981598
local.get $0
15991599
i32.load offset=4
16001600
i32.add
16011601
)
1602-
(func $start:closure-common-js-patterns~anonymous|2 (param $0 i32) (param $1 i32) (result i32)
1602+
(func $start:closure-common-js-patterns~~anonymous|2 (param $0 i32) (param $1 i32) (result i32)
16031603
(local $2 i32)
16041604
(local $3 i32)
16051605
(local $4 i32)

‎tests/compiler/closure.optimized.wat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
(data (i32.const 1136) "\1e\00\00\00\01\00\00\00\01\00\00\00\1e\00\00\00~\00l\00i\00b\00/\00r\00t\00/\00p\00u\00r\00e\00.\00t\00s")
2020
(data (i32.const 1184) "\03\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00 ")
2121
(table $0 7 funcref)
22-
(elem (i32.const 1) $closure/testParam~inner $closure/testParam~inner $closure/testParam~inner $closure/createClosure~anonymous|0 $closure/runInline~anonymous|0 $closure/returnOverBoundary~anonymous|0)
22+
(elem (i32.const 1) $closure/testParam~inner $closure/testParam~inner $closure/testParam~inner $closure/createClosure~~anonymous|0 $closure/runInline~~anonymous|0 $closure/returnOverBoundary~~anonymous|0)
2323
(global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
2424
(global $~lib/rt/tlsf/collectLock (mut i32) (i32.const 0))
2525
(global $~lib/rt/__rtti_base i32 (i32.const 1184))
@@ -1111,7 +1111,7 @@
11111111
local.get $0
11121112
i32.load offset=4
11131113
)
1114-
(func $closure/createClosure~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
1114+
(func $closure/createClosure~~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
11151115
local.get $1
11161116
local.get $0
11171117
i32.load offset=4
@@ -1135,7 +1135,7 @@
11351135
local.get $0
11361136
call $~lib/rt/pure/__release
11371137
)
1138-
(func $closure/runInline~anonymous|0 (param $0 i32) (result i32)
1138+
(func $closure/runInline~~anonymous|0 (param $0 i32) (result i32)
11391139
local.get $0
11401140
i32.load offset=12
11411141
local.get $0
@@ -1145,7 +1145,7 @@
11451145
i32.add
11461146
i32.add
11471147
)
1148-
(func $closure/returnOverBoundary~anonymous|0 (param $0 i32) (result i32)
1148+
(func $closure/returnOverBoundary~~anonymous|0 (param $0 i32) (result i32)
11491149
i32.const 6
11501150
)
11511151
(func $closure/returnOverBoundary (result i32)

‎tests/compiler/closure.untouched.wat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
(data (i32.const 128) "\1e\00\00\00\01\00\00\00\01\00\00\00\1e\00\00\00~\00l\00i\00b\00/\00r\00t\00/\00p\00u\00r\00e\00.\00t\00s\00")
2020
(data (i32.const 176) "\03\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00")
2121
(table $0 7 funcref)
22-
(elem (i32.const 1) $closure/testParam~inner $closure/testVar~inner $closure/testLet~inner $closure/createClosure~anonymous|0 $closure/runInline~anonymous|0 $closure/returnOverBoundary~anonymous|0)
22+
(elem (i32.const 1) $closure/testParam~inner $closure/testVar~inner $closure/testLet~inner $closure/createClosure~~anonymous|0 $closure/runInline~~anonymous|0 $closure/returnOverBoundary~~anonymous|0)
2323
(global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
2424
(global $~lib/ASC_LOW_MEMORY_LIMIT i32 (i32.const 0))
2525
(global $~lib/rt/tlsf/collectLock (mut i32) (i32.const 0))
@@ -1629,7 +1629,7 @@
16291629
call $~lib/rt/pure/__release
16301630
local.get $3
16311631
)
1632-
(func $closure/createClosure~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
1632+
(func $closure/createClosure~~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
16331633
local.get $0
16341634
i32.load offset=4
16351635
local.get $1
@@ -1694,7 +1694,7 @@
16941694
call $~lib/rt/pure/__release
16951695
local.get $2
16961696
)
1697-
(func $closure/runInline~anonymous|0 (param $0 i32) (result i32)
1697+
(func $closure/runInline~~anonymous|0 (param $0 i32) (result i32)
16981698
local.get $0
16991699
i32.load offset=4
17001700
local.get $0
@@ -1753,7 +1753,7 @@
17531753
call $~lib/rt/pure/__release
17541754
local.get $2
17551755
)
1756-
(func $closure/returnOverBoundary~anonymous|0 (param $0 i32) (result i32)
1756+
(func $closure/returnOverBoundary~~anonymous|0 (param $0 i32) (result i32)
17571757
i32.const 6
17581758
)
17591759
(func $closure/returnOverBoundary (result i32)

‎tests/compiler/exportimport-table.optimized.wat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
(type $none_=>_none (func))
33
(type $i32_=>_none (func (param i32)))
44
(import "env" "table" (table $0 2 funcref))
5-
(elem (i32.const 1) $start:exportimport-table~anonymous|0)
5+
(elem (i32.const 1) $start:exportimport-table~~anonymous|0)
66
(memory $0 0)
77
(export "memory" (memory $0))
88
(export "table" (table $0))
99
(start $~start)
10-
(func $start:exportimport-table~anonymous|0 (param $0 i32)
10+
(func $start:exportimport-table~~anonymous|0 (param $0 i32)
1111
nop
1212
)
1313
(func $~start

‎tests/compiler/exportimport-table.untouched.wat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
(type $i32_=>_i32 (func (param i32) (result i32)))
55
(type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
66
(import "env" "table" (table $0 2 funcref))
7-
(elem (i32.const 1) $start:exportimport-table~anonymous|0)
7+
(elem (i32.const 1) $start:exportimport-table~~anonymous|0)
88
(memory $0 0)
99
(global $~lib/rt/stub/startOffset (mut i32) (i32.const 0))
1010
(global $~lib/rt/stub/offset (mut i32) (i32.const 0))
@@ -13,7 +13,7 @@
1313
(export "memory" (memory $0))
1414
(export "table" (table $0))
1515
(start $~start)
16-
(func $start:exportimport-table~anonymous|0 (param $0 i32)
16+
(func $start:exportimport-table~~anonymous|0 (param $0 i32)
1717
nop
1818
)
1919
(func $~lib/rt/stub/maybeGrowMemory (param $0 i32)

0 commit comments

Comments
 (0)