fix: CFunctionInfo and CTypeInfo leaks (#24634)

Trying out the deno_core patch Ref denoland/deno_core#832 Closes #24575 --------- Co-authored-by: Bartek Iwańczuk <[email protected]>
denoland · Jul 21, 2024 · 6c5905d · 6c5905d
1 parent 5f6d84a
commit 6c5905d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 44,7 @@ repository = "https://github.com/denoland/deno"
 
 [workspace.dependencies]
 deno_ast = { version = "=0.40.0", features = ["transpiling"] }
-deno_core = { version = "0.294.0" }
 deno_core = { version = "0.296.0" }
 
 deno_bench_util = { version = "0.155.0", path = "./bench_util" }
 deno_lockfile = "0.20.0"

diff --git a/cli/module_loader.rs b/cli/module_loader.rs
@@ -55,7 55,6 @@ use deno_core::ModuleType;
 use deno_core::RequestedModuleType;
 use deno_core::ResolutionKind;
 use deno_core::SourceCodeCacheInfo;
-use deno_core::SourceMapGetter;
 use deno_graph::source::ResolutionMode;
 use deno_graph::source::Resolver;
 use deno_graph::GraphKind;
@@ -293,8 292,7 @@ impl CliModuleLoaderFactory {
  shared: self.shared.clone(),
  })));
  ModuleLoaderAndSourceMapGetter {
- module_loader: loader.clone(),
- source_map_getter: Some(loader),
  module_loader: loader,
  }
  }
 }
@@ -828,11 826,7 @@ impl<TGraphContainer: ModuleGraphContainer> ModuleLoader
  }
  std::future::ready(()).boxed_local()
  }
-}
 
-impl<TGraphContainer: ModuleGraphContainer> SourceMapGetter
- for CliModuleLoader<TGraphContainer>
-{
  fn get_source_map(&self, file_name: &str) -> Option<Vec<u8>> {
  let specifier = resolve_url(file_name).ok()?;
  match specifier.scheme() {
@@ -845,7 839,7 @@ impl<TGraphContainer: ModuleGraphContainer> SourceMapGetter
  source_map_from_code(source.code.as_bytes())
  }
 
- fn get_source_line(
  fn get_source_mapped_source_line(
  &self,
  file_name: &str,
  line_number: usize,

diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
@@ -385,7 385,6 @@ impl ModuleLoaderFactory for StandaloneModuleLoaderFactory {
  root_permissions,
  dynamic_permissions,
  }),
- source_map_getter: None,
  }
  }
 
@@ -400,7 399,6 @@ impl ModuleLoaderFactory for StandaloneModuleLoaderFactory {
  root_permissions,
  dynamic_permissions,
  }),
- source_map_getter: None,
  }
  }
 }

diff --git a/cli/worker.rs b/cli/worker.rs
@@ -18,7 18,6 @@ use deno_core::ModuleId;
 use deno_core::ModuleLoader;
 use deno_core::PollEventLoopOptions;
 use deno_core::SharedArrayBufferStore;
-use deno_core::SourceMapGetter;
 use deno_runtime::code_cache;
 use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
 use deno_runtime::deno_fs;
@@ -55,7 54,6 @@ use crate::version;
 
 pub struct ModuleLoaderAndSourceMapGetter {
  pub module_loader: Rc<dyn ModuleLoader>,
- pub source_map_getter: Option<Rc<dyn SourceMapGetter>>,
 }
 
 pub trait ModuleLoaderFactory: Send Sync {
@@ -516,10 514,7 @@ impl CliMainWorkerFactory {
  (main_module, false)
  };
 
- let ModuleLoaderAndSourceMapGetter {
- module_loader,
- source_map_getter,
- } = shared
  let ModuleLoaderAndSourceMapGetter { module_loader } = shared
  .module_loader_factory
  .create_for_main(PermissionsContainer::allow_all(), permissions.clone());
  let maybe_inspector_server = shared.maybe_inspector_server.clone();
@@ -596,7 591,6 @@ impl CliMainWorkerFactory {
  .clone(),
  root_cert_store_provider: Some(shared.root_cert_store_provider.clone()),
  seed: shared.options.seed,
- source_map_getter,
  format_js_error_fn: Some(Arc::new(format_js_error)),
  create_web_worker_cb,
  maybe_inspector_server,
@@ -730,13 724,11 @@ fn create_web_worker_callback(
  Arc::new(move |args| {
  let maybe_inspector_server = shared.maybe_inspector_server.clone();
 
- let ModuleLoaderAndSourceMapGetter {
- module_loader,
- source_map_getter,
- } = shared.module_loader_factory.create_for_worker(
- args.parent_permissions.clone(),
- args.permissions.clone(),
- );
  let ModuleLoaderAndSourceMapGetter { module_loader } =
  shared.module_loader_factory.create_for_worker(
  args.parent_permissions.clone(),
  args.permissions.clone(),
  );
  let create_web_worker_cb =
  create_web_worker_callback(mode, shared.clone(), stdio.clone());
 
@@ -802,7 794,6 @@ fn create_web_worker_callback(
  seed: shared.options.seed,
  create_web_worker_cb,
  format_js_error_fn: Some(Arc::new(format_js_error)),
- source_map_getter,
  module_loader,
  fs: shared.fs.clone(),
  node_resolver: Some(shared.node_resolver.clone()),

diff --git 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
@@ -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(),

diff --git a/tests/integration/compile_tests.rs b/tests/integration/compile_tests.rs
@@ -107,7 107,6 @@ fn standalone_error() {
  // On Windows, we cannot assert the file path (because '\').
  // Instead we just check for relevant output.
  assert_contains!(stderr, "error: Uncaught (in promise) Error: boom!");
- assert_contains!(stderr, "throw new Error(\"boom!\");");
  assert_contains!(stderr, "\n at boom (file://");
  assert_contains!(stderr, "standalone_error.ts:2:9");
  assert_contains!(stderr, "at foo (file://");
@@ -147,7 146,6 @@ fn standalone_error_module_with_imports() {
  // On Windows, we cannot assert the file path (because '\').
  // Instead we just check for relevant output.
  assert_contains!(stderr, "error: Uncaught (in promise) Error: boom!");
- assert_contains!(stderr, "throw new Error(\"boom!\");");
  assert_contains!(stderr, "\n at file://");
  assert_contains!(stderr, "standalone_error_module_with_imports_2.ts:2:7");
  output.assert_exit_code(1);