Fix

mlir-rs · Oct 14, 2023 · 34f24aa · 34f24aa
1 parent e4b329b
commit 34f24aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/melior/src/context.rs b/melior/src/context.rs
@@ -129,11 +129,8 @@ impl Context {
         unsafe { mlirContextDetachDiagnosticHandler(self.to_raw(), id.to_raw()) }
     }
 
-    pub(crate) fn create_c_string(&self, string: &str) -> &CString {
-        self.string_cache
-            .entry(CString::new(string).unwrap())
-            .or_insert_with(Default::default)
-            .key()
+    pub(crate) fn string_cache(&self) -> &DashMap<CString, ()> {
+        &self.string_cache
     }
 }
 

diff --git a/melior/src/string_ref.rs b/melior/src/string_ref.rs
@@ -1,6 +1,7 @@
 use crate::Context;
 use mlir_sys::{mlirStringRefCreateFromCString, mlirStringRefEqual, MlirStringRef};
 use std::{
+    ffi::CString,
     marker::PhantomData,
     slice,
     str::{self, Utf8Error},
@@ -19,7 +20,12 @@ pub struct StringRef<'c> {
 
 impl<'c> StringRef<'c> {
     pub fn from_str(context: &'c Context, string: &str) -> Self {
-        let string = context.create_c_string(string).as_ptr();
+        let string = context
+            .string_cache()
+            .entry(CString::new(string).unwrap())
+            .or_insert_with(Default::default)
+            .key()
+            .as_ptr();
 
         unsafe { Self::from_raw(mlirStringRefCreateFromCString(string)) }
     }