From 445e05a39d005eab6f7d2f1f67a7ae2d7c85b1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Wed, 24 Jul 2024 01:11:38 +0100
Subject: Reland "fix: CFunctionInfo and CTypeInfo leaks (#24634)" (#24692)

Reverted in
https://github.com/denoland/deno/commit/95847f4e9443ad8c8e0504c9fdd1d7f8eb4e588f.
---
 runtime/js/01_errors.js | 9 +--------
 runtime/js/99_main.js   | 1 -
 runtime/web_worker.rs   | 3 ---
 runtime/worker.rs       | 5 -----
 4 files changed, 1 insertion(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/js/01_errors.js b/runtime/js/01_errors.js
index ff2c619f4..bfcb540e2 100644
--- a/runtime/js/01_errors.js
+++ b/runtime/js/01_errors.js
@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 import { core, primordials } from "ext:core/mod.js";
-const { BadResource, Interrupted } = core;
+const { BadResource, Interrupted, PermissionDenied } = core;
 const { Error } = primordials;
 
 class NotFound extends Error {
@@ -11,13 +11,6 @@ class NotFound extends Error {
   }
 }
 
-class PermissionDenied extends Error {
-  constructor(msg) {
-    super(msg);
-    this.name = "PermissionDenied";
-  }
-}
-
 class ConnectionRefused extends Error {
   constructor(msg) {
     super(msg);
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index 44dc3c54d..e4d26b5de 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -387,7 +387,6 @@ function formatException(error) {
 }
 
 core.registerErrorClass("NotFound", errors.NotFound);
-core.registerErrorClass("PermissionDenied", errors.PermissionDenied);
 core.registerErrorClass("ConnectionRefused", errors.ConnectionRefused);
 core.registerErrorClass("ConnectionReset", errors.ConnectionReset);
 core.registerErrorClass("ConnectionAborted", errors.ConnectionAborted);
diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
index 08de53216..cf0384196 100644
--- a/runtime/web_worker.rs
+++ b/runtime/web_worker.rs
@@ -38,7 +38,6 @@ use deno_core::ModuleSpecifier;
 use deno_core::PollEventLoopOptions;
 use deno_core::RuntimeOptions;
 use deno_core::SharedArrayBufferStore;
-use deno_core::SourceMapGetter;
 use deno_cron::local::LocalCronHandler;
 use deno_fs::FileSystem;
 use deno_http::DefaultHttpPropertyExtractor;
@@ -369,7 +368,6 @@ pub struct WebWorkerOptions {
   pub npm_resolver: Option<Arc<dyn deno_node::NpmResolver>>,
   pub create_web_worker_cb: Arc<ops::worker_host::CreateWebWorkerCb>,
   pub format_js_error_fn: Option<Arc<FormatJsErrorFn>>,
-  pub source_map_getter: Option<Rc<dyn SourceMapGetter>>,
   pub worker_type: WebWorkerType,
   pub maybe_inspector_server: Option<Arc<InspectorServer>>,
   pub get_error_class_fn: Option<GetErrorClassFn>,
@@ -546,7 +544,6 @@ impl WebWorker {
     let mut js_runtime = JsRuntime::new(RuntimeOptions {
       module_loader: Some(options.module_loader.clone()),
       startup_snapshot: options.startup_snapshot,
-      source_map_getter: options.source_map_getter,
       get_error_class_fn: options.get_error_class_fn,
       shared_array_buffer_store: options.shared_array_buffer_store.clone(),
       compiled_wasm_module_store: options.compiled_wasm_module_store.clone(),
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 9207de227..fc11be582 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -33,7 +33,6 @@ use deno_core::PollEventLoopOptions;
 use deno_core::RuntimeOptions;
 use deno_core::SharedArrayBufferStore;
 use deno_core::SourceCodeCacheInfo;
-use deno_core::SourceMapGetter;
 use deno_cron::local::LocalCronHandler;
 use deno_fs::FileSystem;
 use deno_http::DefaultHttpPropertyExtractor;
@@ -162,8 +161,6 @@ pub struct WorkerOptions {
   pub create_web_worker_cb: Arc<ops::worker_host::CreateWebWorkerCb>,
   pub format_js_error_fn: Option<Arc<FormatJsErrorFn>>,
 
-  /// Source map reference for errors.
-  pub source_map_getter: Option<Rc<dyn SourceMapGetter>>,
   pub maybe_inspector_server: Option<Arc<InspectorServer>>,
   // If true, the worker will wait for inspector session and break on first
   // statement of user code. Takes higher precedence than
@@ -226,7 +223,6 @@ impl Default for WorkerOptions {
       origin_storage_dir: Default::default(),
       cache_storage_dir: Default::default(),
       broadcast_channel: Default::default(),
-      source_map_getter: Default::default(),
       root_cert_store_provider: Default::default(),
       node_resolver: Default::default(),
       npm_resolver: Default::default(),
@@ -486,7 +482,6 @@ impl MainWorker {
       module_loader: Some(options.module_loader.clone()),
       startup_snapshot: options.startup_snapshot,
       create_params: options.create_params,
-      source_map_getter: options.source_map_getter,
       skip_op_registration: options.skip_op_registration,
       get_error_class_fn: options.get_error_class_fn,
       shared_array_buffer_store: options.shared_array_buffer_store.clone(),
-- 
cgit v1.2.3