Workaround #5604 (#5615)

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>

2 files changed, 37 insertions, 8 deletions

diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp
index 815d6a206..a75135844 100644
--- a/src/bun.js/bindings/ZigGlobalObject.cpp
+++ b/src/bun.js/bindings/ZigGlobalObject.cpp
@@ -2068,9 +2068,11 @@ static inline EncodedJSValue functionPerformanceNowBody(JSGlobalObject* globalOb
 {
     auto* global = reinterpret_cast<GlobalObject*>(globalObject);
     // nanoseconds to seconds
-    uint64_t time = Bun__readOriginTimer(global->bunVM());
+    double time = static_cast<double>(Bun__readOriginTimer(global->bunVM()));
     double result = time / 1000000.0;
-    return JSValue::encode(jsNumber(result));
+
+    // https://github.com/oven-sh/bun/issues/5604
+    return JSValue::encode(jsDoubleNumber(result));
 }
 
 extern "C" {
@@ -2109,11 +2111,12 @@ private:
 
     void finishCreation(JSC::VM& vm)
     {
+
         static const JSC::DOMJIT::Signature DOMJITSignatureForPerformanceNow(
             functionPerformanceNowWithoutTypeCheck,
             JSPerformanceObject::info(),
             JSC::DOMJIT::Effect::forWriteKinds(DFG::AbstractHeapKind::SideState),
-            SpecBytecodeDouble);
+            SpecDoubleReal);
 
         JSFunction* now = JSFunction::create(
             vm,
@@ -2122,7 +2125,7 @@ private:
             String("now"_s),
             functionPerformanceNow, ImplementationVisibility::Public, NoIntrinsic, functionPerformanceNow,
             &DOMJITSignatureForPerformanceNow);
-        this->putDirect(vm, JSC::Identifier::fromString(vm, "now"_s), now, JSC::PropertyAttribute::DOMJITFunction | JSC::PropertyAttribute::Function);
+        this->putDirect(vm, JSC::Identifier::fromString(vm, "now"_s), now, JSC::PropertyAttribute::Function | 0);
 
         JSFunction* noopNotImplemented = JSFunction::create(
             vm,
@@ -2130,10 +2133,11 @@ private:
             0,
             String("noopNotImplemented"_s),
             functionNoop, ImplementationVisibility::Public, NoIntrinsic, functionNoop,
-            &DOMJITSignatureForPerformanceNow);
-        this->putDirect(vm, JSC::Identifier::fromString(vm, "mark"_s), noopNotImplemented, JSC::PropertyAttribute::DOMJITFunction | JSC::PropertyAttribute::Function);
-        this->putDirect(vm, JSC::Identifier::fromString(vm, "markResourceTiming"_s), noopNotImplemented, JSC::PropertyAttribute::DOMJITFunction | JSC::PropertyAttribute::Function);
-        this->putDirect(vm, JSC::Identifier::fromString(vm, "measure"_s), noopNotImplemented, JSC::PropertyAttribute::DOMJITFunction | JSC::PropertyAttribute::Function);
+            nullptr);
+
+        this->putDirect(vm, JSC::Identifier::fromString(vm, "mark"_s), noopNotImplemented, JSC::PropertyAttribute::Function | 0);
+        this->putDirect(vm, JSC::Identifier::fromString(vm, "markResourceTiming"_s), noopNotImplemented, JSC::PropertyAttribute::Function | 0);
+        this->putDirect(vm, JSC::Identifier::fromString(vm, "measure"_s), noopNotImplemented, JSC::PropertyAttribute::Function | 0);
 
         this->putDirect(
             vm,
diff --git a/test/js/web/timers/performance.test.js b/test/js/web/timers/performance.test.js
index dd50c4dc6..0d6cd577b 100644
--- a/test/js/web/timers/performance.test.js
+++ b/test/js/web/timers/performance.test.js
@@ -20,3 +20,28 @@ it("performance.now() should be monotonic", () => {
 it("performance.timeOrigin + performance.now() should be similar to Date.now()", () => {
   expect(Math.abs(performance.timeOrigin + performance.now() - Date.now()) < 1000).toBe(true);
 });
+
+// https://github.com/oven-sh/bun/issues/5604
+it("performance.now() DOMJIT", () => {
+  // This test is very finnicky.
+  // It has to return true || return false to reproduce. Throwing an error doesn't work.
+  function run(start, prev) {
+    while (true) {
+      const current = performance.now();
+
+      if (Number.isNaN(current) || current < prev) {
+        return false;
+      }
+
+      if (current - start > 200) {
+        return true;
+      }
+      prev = current;
+    }
+  }
+
+  const start = performance.now();
+  if (!run(start, start)) {
+    throw new Error("performance.now() is not monotonic");
+  }
+});