From b0bb65f4942ee7bd10eb784a2c5ed982f1185e70 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Wed, 15 Sep 2021 18:07:08 -0700 Subject: Big Heap: --- src/http.zig | 2 +- src/javascript/jsc/WebKit | 2 +- src/javascript/jsc/bindings/ZigGlobalObject.cpp | 7 ++----- src/resolver/resolve_path.zig | 3 ++- src/runtime.version | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/http.zig b/src/http.zig index aacc25423..65a769e59 100644 --- a/src/http.zig +++ b/src/http.zig @@ -1220,7 +1220,7 @@ pub const RequestContext = struct { pub fn runLoop(vm: *JavaScript.VirtualMachine, thread: *HandlerThread) !void { var module_map = ZigGlobalObject.getModuleRegistryMap(vm.global); if (!VM.isJITEnabled()) { - Output.prettyErrorln("warn: JIT is disabled,,, this is a bug in Bun and/or a permissions problem. JS will run slower.", .{}); + Output.prettyErrorln("warn: JIT is disabled,,,this is a bug in Bun and/or a permissions problem. JS will run slower.", .{}); } while (true) { diff --git a/src/javascript/jsc/WebKit b/src/javascript/jsc/WebKit index 47a606f4a..e7d31961d 160000 --- a/src/javascript/jsc/WebKit +++ b/src/javascript/jsc/WebKit @@ -1 +1 @@ -Subproject commit 47a606f4a5f7b72335d2d1af2af1cc434d825b62 +Subproject commit e7d31961d4bf98b3e8b1df3ea0398ea1517a61df diff --git a/src/javascript/jsc/bindings/ZigGlobalObject.cpp b/src/javascript/jsc/bindings/ZigGlobalObject.cpp index 8caf09662..b7ebe53d2 100644 --- a/src/javascript/jsc/bindings/ZigGlobalObject.cpp +++ b/src/javascript/jsc/bindings/ZigGlobalObject.cpp @@ -91,13 +91,10 @@ extern "C" JSC__JSGlobalObject *Zig__GlobalObject__create(JSClassRef *globalObje WTF::initializeMainThread(); JSC::initialize(); + // JSC::Options::useCodeCache() = false; -#ifdef WTF_CPU_ARM64 - auto heapSize = JSC::SmallHeap; -#else auto heapSize = JSC::LargeHeap; -#endif JSC::VM &vm = JSC::VM::create(heapSize).leakRef(); vm.heap.acquireAccess(); @@ -107,7 +104,7 @@ extern "C" JSC__JSGlobalObject *Zig__GlobalObject__create(JSClassRef *globalObje JSC::JSLockHolder locker(vm); Zig::GlobalObject *globalObject = - Zig::GlobalObject::create(vm, Zig::GlobalObject::createStructure(vm, JSC::jsNull())); + Zig::GlobalObject::create(vm, Zig::GlobalObject::createStructure(vm, JSC::jsNull())); globalObject->setConsole(globalObject); if (count > 0) { globalObject->installAPIGlobals(globalObjectClass, count); } diff --git a/src/resolver/resolve_path.zig b/src/resolver/resolve_path.zig index 62d951f22..fe60f78d0 100644 --- a/src/resolver/resolve_path.zig +++ b/src/resolver/resolve_path.zig @@ -1,8 +1,9 @@ const tester = @import("../test/tester.zig"); +const std = @import("std"); const FeatureFlags = @import("../feature_flags.zig"); const default_allocator = @import("../memory_allocator.zig").c_allocator; -const std = @import("std"); + threadlocal var parser_join_input_buffer: [1024]u8 = undefined; threadlocal var parser_buffer: [1024]u8 = undefined; diff --git a/src/runtime.version b/src/runtime.version index 2c1fbc202..b15675d52 100644 --- a/src/runtime.version +++ b/src/runtime.version @@ -1 +1 @@ -510583ac26030943 \ No newline at end of file +b0e082b789747982 \ No newline at end of file -- cgit v1.2.3