dont make new InternedString in hot path

rust-lang · Jul 8, 2024 · c8070a1 · c8070a1
1 parent e98f702
commit c8070a1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/src/cargo/core/resolver/dep_cache.rs b/src/cargo/core/resolver/dep_cache.rs
@@ -21,7 +21,7 @@ use crate::core::{
 };
 use crate::sources::source::QueryKind;
 use crate::util::errors::CargoResult;
-use crate::util::interning::InternedString;
+use crate::util::interning::{InternedString, DEFAULT_INTERNED_STRING};
 
 use anyhow::Context as _;
 use std::collections::{BTreeSet, HashMap, HashSet};
@@ -348,7 +348,7 @@ fn build_requirements<'a, 'b: 'a>(
 
     let handle_default = |uses_default_features, reqs: &mut Requirements<'_>| {
         if uses_default_features && s.features().contains_key("default") {
-            if let Err(e) = reqs.require_feature(InternedString::new("default")) {
+            if let Err(e) = reqs.require_feature(DEFAULT_INTERNED_STRING) {
                 return Err(e.into_activate_error(parent, s));
             }
         }

diff --git a/src/cargo/core/resolver/features.rs b/src/cargo/core/resolver/features.rs
@@ -43,7 +43,7 @@ use crate::core::dependency::{ArtifactTarget, DepKind, Dependency};
 use crate::core::resolver::types::FeaturesSet;
 use crate::core::resolver::{Resolve, ResolveBehavior};
 use crate::core::{FeatureValue, PackageId, PackageIdSpec, PackageSet, Workspace};
-use crate::util::interning::InternedString;
+use crate::util::interning::{InternedString, DEFAULT_INTERNED_STRING};
 use crate::util::CargoResult;
 use anyhow::{bail, Context};
 use itertools::Itertools;
@@ -745,9 +745,8 @@ impl<'a, 'gctx> FeatureResolver<'a, 'gctx> {
             .iter()
             .map(|f| FeatureValue::new(*f))
             .collect();
-        let default = InternedString::new("default");
-        if dep.uses_default_features() && feature_map.contains_key(&default) {
-            result.push(FeatureValue::Feature(default));
+        if dep.uses_default_features() && feature_map.contains_key(&DEFAULT_INTERNED_STRING) {
+            result.push(FeatureValue::Feature(DEFAULT_INTERNED_STRING));
         }
         result
     }
@@ -762,9 +761,8 @@ impl<'a, 'gctx> FeatureResolver<'a, 'gctx> {
         let feature_map = summary.features();
 
         let mut result: Vec<FeatureValue> = cli_features.features.iter().cloned().collect();
-        let default = InternedString::new("default");
-        if cli_features.uses_default_features && feature_map.contains_key(&default) {
-            result.push(FeatureValue::Feature(default));
+        if cli_features.uses_default_features && feature_map.contains_key(&DEFAULT_INTERNED_STRING) {
+            result.push(FeatureValue::Feature(DEFAULT_INTERNED_STRING));
         }
 
         if cli_features.all_features {

diff --git a/src/cargo/ops/tree/graph.rs b/src/cargo/ops/tree/graph.rs
@@ -6,7 +6,7 @@ use crate::core::dependency::DepKind;
 use crate::core::resolver::features::{CliFeatures, FeaturesFor, ResolvedFeatures};
 use crate::core::resolver::Resolve;
 use crate::core::{FeatureMap, FeatureValue, Package, PackageId, PackageIdSpec, Workspace};
-use crate::util::interning::InternedString;
+use crate::util::interning::{InternedString, DEFAULT_INTERNED_STRING};
 use crate::util::CargoResult;
 use std::collections::{HashMap, HashSet};
 
@@ -415,7 +415,7 @@ fn add_pkg(
                 if dep.uses_default_features() {
                     add_feature(
                         graph,
-                        InternedString::new("default"),
+                        DEFAULT_INTERNED_STRING,
                         Some(from_index),
                         dep_index,
                         EdgeKind::Dep(dep.kind()),
@@ -505,7 +505,7 @@ fn add_cli_features(
     }
 
     if cli_features.uses_default_features {
-        to_add.insert(FeatureValue::Feature(InternedString::new("default")));
+        to_add.insert(FeatureValue::Feature(DEFAULT_INTERNED_STRING));
     }
     to_add.extend(cli_features.features.iter().cloned());
 

diff --git a/src/cargo/util/interning.rs b/src/cargo/util/interning.rs
@@ -13,7 +13,19 @@ use std::str;
 use std::sync::Mutex;
 use std::sync::OnceLock;
 
-static STRING_CACHE: OnceLock<Mutex<HashSet<&'static str>>> = OnceLock::new();
+pub static DEFAULT_INTERNED_STRING: InternedString = InternedString { inner: "default" };
+
+fn cache_init() -> std::sync::MutexGuard<'static, HashSet<&'static str>> {
+    static STRING_CACHE: OnceLock<Mutex<HashSet<&'static str>>> = OnceLock::new();
+    STRING_CACHE
+        .get_or_init(|| {
+            let mut out: HashSet<&'static str> = Default::default();
+            out.insert(DEFAULT_INTERNED_STRING.as_str());
+            Mutex::new(out)
+        })
+        .lock()
+        .unwrap()
+}
 
 #[derive(Clone, Copy)]
 pub struct InternedString {
@@ -60,8 +72,8 @@ impl Eq for InternedString {}
 
 impl InternedString {
     pub fn new(str: &str) -> InternedString {
-        let mut cache = STRING_CACHE.get_or_init(Default::default).lock().unwrap();
-        let s = cache.get(str).cloned().unwrap_or_else(|| {
+        let mut cache = cache_init();
+        let s = cache.get(str).copied().unwrap_or_else(|| {
             let s = str.to_string().leak();
             cache.insert(s);
             s