Skip to content

Commit df8aa4c

Browse files
Jarred-Sumnerclaude
andcommitted
Resolve merge conflicts preserving Bun's AsyncContext support
- PromiseOperations.js: Keep AsyncContext parameter and add @neverInline from upstream - PlatformHave.h: Merge Apple platform feature detection for both compatibility mode and randomization API - Interpreter.cpp: Preserve Bun's stack trace appender while adding upstream's async stack traces 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
2 parents f474428 + 9f947c9 commit df8aa4c

File tree

899 files changed

+254068
-263638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

899 files changed

+254068
-263638
lines changed

Configurations/Version.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
MAJOR_VERSION = 623;
2525
MINOR_VERSION = 1;
26-
TINY_VERSION = 5;
26+
TINY_VERSION = 7;
2727
MICRO_VERSION = 0;
2828
NANO_VERSION = 0;
2929
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
function test(syncIterable) {
2+
return Array.fromAsync(syncIterable);
3+
}
4+
noInline(test);
5+
6+
const syncIterable = {
7+
[Symbol.iterator]() {
8+
return {
9+
next() {
10+
return { value: undefined, done: true };
11+
}
12+
};
13+
}
14+
};
15+
16+
for (let i = 0; i < 1e5; i++) {
17+
test(syncIterable);
18+
}

JSTests/microbenchmarks/exceptions-simd.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ skip unless $isWasmPlatform
21
//@ skip unless $isSIMDPlatform
32
//@ $skipModes << :lockdown
43
//@ requireOptions("--useWasmSIMD=1")

JSTests/microbenchmarks/interpreter-wasm.js

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

JSTests/microbenchmarks/memcpy-wasm-large.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ skip unless $isWasmPlatform
21
//@ $skipModes << :lockdown
32
//@ requireOptions("--useExecutableAllocationFuzz=false")
43
// Source in wasm/stress/memcpy-wasm

JSTests/microbenchmarks/memcpy-wasm-medium.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ skip unless $isWasmPlatform
21
//@ $skipModes << :lockdown
32
//@ requireOptions("--useExecutableAllocationFuzz=false")
43
// Source in wasm/stress/memcpy-wasm

JSTests/microbenchmarks/memcpy-wasm-small.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ skip unless $isWasmPlatform
21
//@ $skipModes << :lockdown
32
//@ requireOptions("--useExecutableAllocationFuzz=false")
43
// Source in wasm/stress/memcpy-wasm

JSTests/microbenchmarks/memcpy-wasm.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ skip unless $isWasmPlatform
21
//@ $skipModes << :lockdown
32
//@ skip if $model == "Apple Watch Series 3" # added by mark-jsc-stress-test.py
43
//@ requireOptions("--useExecutableAllocationFuzz=false")
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
function test(x) {
2+
return typeof x < "u";
3+
}
4+
noInline(test);
5+
6+
for (let i = 0; i < 1e6; i++) {
7+
test(i % 2 === 0 ? undefined : i);
8+
}

JSTests/microbenchmarks/wasm-cc-int-to-int.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ skip unless $isWasmPlatform
21
//@ runDefaultWasm("--useWasm=1")
32

43
var wasm_code;

0 commit comments

Comments
 (0)