From ceae7ef6722087ee88085dfa1c7e428af2fd6929 Mon Sep 17 00:00:00 2001
From: Jarred SUmner <jarred@jarredsumner.com>
Date: Tue, 21 Dec 2021 19:44:09 -0800
Subject: [PATCH] Slightly less pointer chasing

---
 src/bundler.zig                   | 20 +++++++++++++-------
 src/javascript/jsc/WebKit         |  2 +-
 src/javascript/jsc/javascript.zig |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/bundler.zig b/src/bundler.zig
index 4c6c280435..034733515d 100644
--- a/src/bundler.zig
+++ b/src/bundler.zig
@@ -598,7 +598,13 @@ pub const Bundler = struct {
                     this.data.scan_pass_result = js_parser.ScanPassResult.init(this.generator.allocator);
                     var bundler = this.generator.bundler.*;
                     var bundler_ptr = &bundler;
+                    const CacheSet = @import("./cache.zig");
+                    // no funny business mr. cache
+                    bundler_ptr.resolver.caches = CacheSet.Set.init(this.allocator);
                     bundler_ptr.linker.resolver = &bundler_ptr.resolver;
+                    bundler_ptr.log = this.data.log;
+                    bundler_ptr.linker.log = this.data.log;
+                    bundler_ptr.linker.resolver.log = this.data.log;
 
                     defer {
                         {
@@ -886,7 +892,7 @@ pub const Bundler = struct {
                 const entry_points = try router.getEntryPoints();
                 for (entry_points) |entry_point| {
                     const source_dir = bundler.fs.top_level_dir;
-                    const resolved = try bundler.linker.resolver.resolve(source_dir, entry_point, .entry_point);
+                    const resolved = try bundler.resolver.resolve(source_dir, entry_point, .entry_point);
                     try this.enqueueItem(resolved);
                 }
                 this.bundler.resetStore();
@@ -898,7 +904,7 @@ pub const Bundler = struct {
 
                 const entry_point_path = bundler.normalizeEntryPointPath(entry_point);
                 const source_dir = bundler.fs.top_level_dir;
-                const resolved = try bundler.linker.resolver.resolve(source_dir, entry_point, .entry_point);
+                const resolved = try bundler.resolver.resolve(source_dir, entry_point, .entry_point);
                 try this.enqueueItem(resolved);
             }
 
@@ -918,7 +924,7 @@ pub const Bundler = struct {
                     if (bundler.options.platform.isBun()) {
                         if (framework.server.isEnabled()) {
                             Analytics.Features.bunjs = true;
-                            const resolved = try bundler.linker.resolver.resolve(
+                            const resolved = try bundler.resolver.resolve(
                                 bundler.fs.top_level_dir,
                                 framework.server.path,
                                 .entry_point,
@@ -927,7 +933,7 @@ pub const Bundler = struct {
                         }
                     } else {
                         if (framework.client.isEnabled()) {
-                            const resolved = try bundler.linker.resolver.resolve(
+                            const resolved = try bundler.resolver.resolve(
                                 bundler.fs.top_level_dir,
                                 framework.client.path,
                                 .entry_point,
@@ -936,7 +942,7 @@ pub const Bundler = struct {
                         }
 
                         if (framework.fallback.isEnabled()) {
-                            const resolved = try bundler.linker.resolver.resolve(
+                            const resolved = try bundler.resolver.resolve(
                                 bundler.fs.top_level_dir,
                                 framework.fallback.path,
                                 .entry_point,
@@ -1589,7 +1595,7 @@ pub const Bundler = struct {
                                         continue;
                                     }
 
-                                    if (bundler.linker.resolver.resolve(source_dir, import_record.path.text, import_record.kind)) |*_resolved_import| {
+                                    if (bundler.resolver.resolve(source_dir, import_record.path.text, import_record.kind)) |*_resolved_import| {
                                         if (_resolved_import.is_external) {
                                             continue;
                                         }
@@ -1980,7 +1986,7 @@ pub const Bundler = struct {
                                     continue;
                                 }
 
-                                if (bundler.linker.resolver.resolve(source_dir, import_record.path.text, import_record.kind)) |*_resolved_import| {
+                                if (bundler.resolver.resolve(source_dir, import_record.path.text, import_record.kind)) |*_resolved_import| {
                                     if (_resolved_import.is_external) {
                                         continue;
                                     }
diff --git a/src/javascript/jsc/WebKit b/src/javascript/jsc/WebKit
index 58007798f3..a313cfa2bd 160000
--- a/src/javascript/jsc/WebKit
+++ b/src/javascript/jsc/WebKit
@@ -1 +1 @@
-Subproject commit 58007798f366ae8bb7487ca5256a6db860c6da41
+Subproject commit a313cfa2bdc48a3a12f3ee4b53baa2258bc38e73
diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig
index d864c2d175..f185a720cd 100644
--- a/src/javascript/jsc/javascript.zig
+++ b/src/javascript/jsc/javascript.zig
@@ -1226,7 +1226,7 @@ pub const VirtualMachine = struct {
 
             node_module_checker: {
                 const package_json = result.package_json orelse brk: {
-                    if (vm.bundler.linker.resolver.packageJSONForResolvedNodeModule(&result)) |pkg| {
+                    if (vm.bundler.resolver.packageJSONForResolvedNodeModule(&result)) |pkg| {
                         break :brk pkg;
                     } else {
                         break :node_module_checker;