Skip to content

Commit 65bd8d5

Browse files
andrewrkandrewrk
authored
Merge pull request #23061 from pavelverigo/stage2-wasm-misc
stage2-wasm: multiple fixes
2 parents 08a6c4c + 33ad2c9 commit 65bd8d5

19 files changed

+216
-169
lines changed

‎src/arch/wasm/CodeGen.zig

Lines changed: 216 additions & 132 deletions
Large diffs are not rendered by default.

‎test/behavior/array.zig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,6 @@ test "@splat array with sentinel" {
10491049
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
10501050
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
10511051
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1052-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
10531052
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
10541053

10551054
const S = struct {
@@ -1074,7 +1073,6 @@ test "@splat zero-length array" {
10741073
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
10751074
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
10761075
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1077-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
10781076
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
10791077

10801078
const S = struct {

‎test/behavior/bitcast.zig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ test "@bitCast of packed struct of bools all true" {
480480
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
481481
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
482482
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
483-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
484483
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
485484

486485
const P = packed struct {
@@ -501,7 +500,6 @@ test "@bitCast of packed struct of bools all false" {
501500
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
502501
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
503502
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
504-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
505503
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
506504

507505
const P = packed struct {

‎test/behavior/call.zig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ test "method call as parameter type" {
439439
}
440440

441441
test "non-anytype generic parameters provide result type" {
442-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
443442
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
444443
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
445444
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
@@ -469,7 +468,6 @@ test "non-anytype generic parameters provide result type" {
469468
}
470469

471470
test "argument to generic function has correct result type" {
472-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
473471
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
474472
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
475473
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO

‎test/behavior/cast.zig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ test "@floatFromInt(f80)" {
159159
test "@intFromFloat" {
160160
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
161161
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
162-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
163162
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
164163
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
165164

@@ -2640,7 +2639,6 @@ test "numeric coercions with undefined" {
26402639
}
26412640

26422641
test "15-bit int to float" {
2643-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
26442642
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
26452643

26462644
var a: u15 = 42;

‎test/behavior/cast_int.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ test "load non byte-sized value in union" {
214214
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
215215
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
216216
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
217-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
218217
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
219218

220219
// note: this bug is triggered by the == operator, expectEqual will hide it

‎test/behavior/defer.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ test "errdefer with payload" {
134134
test "reference to errdefer payload" {
135135
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
136136
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
137-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
138137
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
139138
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
140139
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;

‎test/behavior/error.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,6 @@ test "result location initialization of error union with OPV payload" {
11071107
}
11081108

11091109
test "return error union with i65" {
1110-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
11111110
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
11121111
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
11131112

‎test/behavior/field_parent_ptr.zig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,6 @@ test "@fieldParentPtr extern struct last zero-bit field" {
588588
test "@fieldParentPtr unaligned packed struct" {
589589
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
590590
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
591-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
592591
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
593592
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
594593

@@ -727,7 +726,6 @@ test "@fieldParentPtr unaligned packed struct" {
727726
test "@fieldParentPtr aligned packed struct" {
728727
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
729728
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
730-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
731729
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
732730
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
733731

@@ -865,7 +863,6 @@ test "@fieldParentPtr aligned packed struct" {
865863

866864
test "@fieldParentPtr nested packed struct" {
867865
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
868-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
869866
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
870867
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
871868

@@ -1028,7 +1025,6 @@ test "@fieldParentPtr nested packed struct" {
10281025

10291026
test "@fieldParentPtr packed struct first zero-bit field" {
10301027
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
1031-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
10321028
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
10331029
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
10341030

@@ -1134,7 +1130,6 @@ test "@fieldParentPtr packed struct first zero-bit field" {
11341130

11351131
test "@fieldParentPtr packed struct middle zero-bit field" {
11361132
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
1137-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
11381133
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
11391134
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
11401135

@@ -1240,7 +1235,6 @@ test "@fieldParentPtr packed struct middle zero-bit field" {
12401235

12411236
test "@fieldParentPtr packed struct last zero-bit field" {
12421237
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
1243-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
12441238
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
12451239
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
12461240

@@ -1753,7 +1747,6 @@ test "@fieldParentPtr extern union" {
17531747
}
17541748

17551749
test "@fieldParentPtr packed union" {
1756-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
17571750
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
17581751
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
17591752
if (builtin.target.cpu.arch.endian() == .big) return error.SkipZigTest; // TODO
@@ -1892,7 +1885,6 @@ test "@fieldParentPtr packed union" {
18921885

18931886
test "@fieldParentPtr tagged union all zero-bit fields" {
18941887
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
1895-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
18961888
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
18971889
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
18981890

‎test/behavior/floatop.zig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ fn testMul(comptime T: type) !void {
123123

124124
test "cmp f16" {
125125
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
126-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
127126
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
128127
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
129128
if (builtin.cpu.arch.isArm() and builtin.target.abi.float() == .soft) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21234
@@ -1540,7 +1539,6 @@ test "neg f16" {
15401539
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
15411540
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
15421541
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1543-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
15441542
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
15451543
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
15461544

@@ -1557,7 +1555,6 @@ test "neg f32/f64" {
15571555
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
15581556
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
15591557
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1560-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
15611558
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
15621559

15631560
try testNeg(f32);

0 commit comments

Comments
 (0)