Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ebfe4d0
WebKit upgrade to 46525dbf2abb (oven-sh/WebKit@f7b52b08)
Jarred-Sumner Apr 28, 2026
f36e82a
use WebKit preview build (pr-203) until WebKit#203 merges
Jarred-Sumner Apr 29, 2026
e17dbd3
bump WebKit preview to a5bf2e31 (pages_committed guard for symmetric …
Jarred-Sumner Apr 29, 2026
54b43d6
bump WebKit preview to 9dc26d0d (asymmetric decommit for TLC allocato…
Jarred-Sumner Apr 29, 2026
d5eec0a
Merge branch 'main' into jarred/webkit-upgrade-46525dbf2abb
Jarred-Sumner Apr 29, 2026
67737fe
WebKit: switch from preview tag to merged main SHA 63bf3a4e (oven-sh/…
Jarred-Sumner Apr 29, 2026
b0d823b
Merge remote-tracking branch 'origin/main' into jarred/webkit-upgrade…
Jarred-Sumner Apr 29, 2026
0e7bbcd
dns.zig: document intentional readable-preference when c-ares request…
Jarred-Sumner Apr 29, 2026
e054a4e
Revert dns.zig FilePoll change — moving to separate PR with proper bi…
Jarred-Sumner Apr 29, 2026
2c8c661
bump WebKit to preview pr-205 (upstream 7de78360 + WebKit#63906 IPInt…
Jarred-Sumner Apr 30, 2026
af435e0
Merge remote-tracking branch 'origin/main' into jarred/webkit-upgrade…
Jarred-Sumner Apr 30, 2026
63d06b1
bump WebKit to preview pr-205-fe9a377f (upstream 013da9aa + pas_proce…
Jarred-Sumner Apr 30, 2026
3ccad45
bindings: MonotonicTime::approximateWallTime() -> approximate<WallTim…
Jarred-Sumner Apr 30, 2026
71a63e9
Merge remote-tracking branch 'origin/main' into jarred/webkit-upgrade…
Jarred-Sumner May 1, 2026
e1aaf4f
bump WebKit to preview pr-205-2c2f4297 (truncateDoubleToInt UB fixes …
Jarred-Sumner May 1, 2026
039dd63
WebKit: switch to merged main SHA 6ef83cb6 (oven-sh/WebKit#205)
Jarred-Sumner May 1, 2026
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
2 changes: 1 addition & 1 deletion scripts/build/deps/webkit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* for local mode. Override via `--webkit-version=<hash>` to test a branch.
* From https://github.com/oven-sh/WebKit releases.
*/
export const WEBKIT_VERSION = "137c59666cfb02c45d04dcfd4b3852e27f78cffc";
export const WEBKIT_VERSION = "6ef83cb658722ff1f33f4a4c9335fb094bed4c6b";

/**
* WebKit (JavaScriptCore) — the JS engine.
Expand Down
2 changes: 1 addition & 1 deletion src/bun.js/bindings/BunAnalyzeTranspiledModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extern "C" JSModuleRecord* JSC_JSModuleRecord__create(JSGlobalObject* globalObje
{
JSModuleRecord* result = JSModuleRecord::create(globalObject, vm, globalObject->moduleRecordStructure(), *moduleKey, sourceCode, declaredVariables, lexicalVariables, hasImportMeta ? ImportMetaFeature : 0);
result->m_isTypeScript = isTypescript;
result->hasTLA(hasTLA);
result->setHasTLA(hasTLA);
return result;
}

Expand Down
8 changes: 4 additions & 4 deletions src/bun.js/bindings/BunCPUProfiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void startCPUProfiler(JSC::VM& vm)
{
// Capture the wall clock time when profiling starts (before creating stopwatch)
// This will be used as the profile's startTime
s_profilingStartTime = MonotonicTime::now().approximateWallTime().secondsSinceEpoch().value() * 1000000.0;
s_profilingStartTime = MonotonicTime::now().approximate<WTF::WallTime>().secondsSinceEpoch().value() * 1000000.0;

// Create a stopwatch and start it
auto stopwatch = WTF::Stopwatch::create();
Expand Down Expand Up @@ -364,7 +364,7 @@ void stopCPUProfiler(JSC::VM& vm, WTF::String* outJSON, WTF::String* outText)
auto& stackTrace = stackTraces[idx];
if (stackTrace.frames.isEmpty()) {
samples.append(1);
double currentTime = stackTrace.timestamp.approximateWallTime().secondsSinceEpoch().value() * 1000000.0;
double currentTime = stackTrace.timestamp.approximate<WTF::WallTime>().secondsSinceEpoch().value() * 1000000.0;
double delta = std::max(0.0, currentTime - lastTime);
timeDeltas.append(static_cast<long long>(delta));
lastTime = currentTime;
Expand Down Expand Up @@ -538,7 +538,7 @@ void stopCPUProfiler(JSC::VM& vm, WTF::String* outJSON, WTF::String* outText)

samples.append(currentParentId);

double currentTime = stackTrace.timestamp.approximateWallTime().secondsSinceEpoch().value() * 1000000.0;
double currentTime = stackTrace.timestamp.approximate<WTF::WallTime>().secondsSinceEpoch().value() * 1000000.0;
double delta = std::max(0.0, currentTime - lastTime);
timeDeltas.append(static_cast<long long>(delta));
lastTime = currentTime;
Expand Down Expand Up @@ -629,7 +629,7 @@ void stopCPUProfiler(JSC::VM& vm, WTF::String* outJSON, WTF::String* outText)
for (size_t idx : sortedIndices) {
auto& stackTrace = stackTraces[idx];

double currentTime = stackTrace.timestamp.approximateWallTime().secondsSinceEpoch().value() * 1000000.0;
double currentTime = stackTrace.timestamp.approximate<WTF::WallTime>().secondsSinceEpoch().value() * 1000000.0;
long long deltaUs = static_cast<long long>(std::max(0.0, currentTime - lastTime));
totalTimeUs += deltaUs;
lastTime = currentTime;
Expand Down
2 changes: 1 addition & 1 deletion src/bun.js/bindings/BunObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ JSC_DEFINE_HOST_FUNCTION(functionBunSleep,

if (millisecondsValue.inherits<JSC::DateInstance>()) {
auto now = MonotonicTime::now();
double milliseconds = uncheckedDowncast<JSC::DateInstance>(millisecondsValue)->internalNumber() - now.approximateWallTime().secondsSinceEpoch().milliseconds();
double milliseconds = uncheckedDowncast<JSC::DateInstance>(millisecondsValue)->internalNumber() - now.approximate<WTF::WallTime>().secondsSinceEpoch().milliseconds();
millisecondsValue = JSC::jsNumber(milliseconds > 0 ? std::ceil(milliseconds) : 0);
}

Expand Down
Loading
Loading