additional intern_static_str

youknowone · youknowone · commit 69e1f6969ff5 · 2023-06-14T17:25:37.000+09:00
diff --git a/derive-impl/src/pymodule.rs b/derive-impl/src/pymodule.rs
@@ -571,7 +571,7 @@ impl ModuleItem for ClassItem {
         let set_attr = match py_names.len() {
             0 => quote! {
                 let _ = new_class;  // suppress warning
-                let _ = vm.ctx.intern_str(#class_name);
+                let _ = vm.ctx.intern_str(#class_name);  // TODO: intern_static_str
             },
             1 => {
                 let py_name = &py_names[0];
diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -71,7 +71,7 @@ impl PyDict {
             Err(other) => other,
         };
         let dict = &self.entries;
-        if let Some(keys) = vm.get_method(other.clone(), vm.ctx.intern_str("keys")) {
+        if let Some(keys) = vm.get_method(other.clone(), vm.ctx.interned_str("keys").unwrap()) {
             let keys = keys?.call((), vm)?.get_iter(vm)?;
             while let PyIterReturn::Return(key) = keys.next(vm)? {
                 let val = other.get_item(&*key, vm)?;
@@ -525,7 +525,7 @@ impl Representable for PyDict {
 
             vm.ctx.new_str(format!("{{{}}}", str_parts.join(", ")))
         } else {
-            vm.ctx.intern_str("{...}").to_owned()
+            vm.ctx.intern_static_str("{...}").to_owned()
         };
         Ok(s)
     }
@@ -815,7 +815,7 @@ macro_rules! dict_view {
                     vm.ctx
                         .new_str(format!("{}([{}])", Self::NAME, str_parts.join(", ")))
                 } else {
-                    vm.ctx.intern_str("{...}").to_owned()
+                    vm.ctx.intern_static_str("{...}").to_owned()
                 };
                 Ok(s)
             }
diff --git a/vm/src/builtins/frame.rs b/vm/src/builtins/frame.rs
@@ -22,7 +22,7 @@ impl Representable for Frame {
     #[inline]
     fn repr(_zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyStrRef> {
         const REPR: &str = "<frame object at .. >";
-        Ok(vm.ctx.intern_str(REPR).to_owned())
+        Ok(vm.ctx.intern_static_str(REPR).to_owned())
     }
 
     #[cold]
diff --git a/vm/src/builtins/str.rs b/vm/src/builtins/str.rs
@@ -174,7 +174,7 @@ impl<'a> AsPyStr<'a> for &'a PyStrRef {
 impl AsPyStr<'static> for &'static str {
     #[inline]
     fn as_pystr(self, ctx: &Context) -> &'static Py<PyStr> {
-        ctx.intern_str(self)
+        ctx.intern_static_str(self)
     }
 }
 
diff --git a/vm/src/warn.rs b/vm/src/warn.rs
@@ -330,7 +330,11 @@ fn setup_context(
     let (globals, filename, lineno) = if let Some(f) = f {
         (f.globals.clone(), f.code.source_path, f.f_lineno())
     } else {
-        (vm.current_globals().clone(), vm.ctx.intern_str("sys"), 1)
+        (
+            vm.current_globals().clone(),
+            vm.ctx.interned_str("sys").unwrap(),
+            1,
+        )
     };
 
     let registry = if let Ok(registry) = globals.get_item(__warningregistry__, vm) {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ impl Representable for Frame {`
`22`	`22`	`#[inline]`
`23`	`23`	`fn repr(_zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyStrRef> {`
`24`	`24`	`const REPR: &str = "<frame object at .. >";`
`25`		`- Ok(vm.ctx.intern_str(REPR).to_owned())`
	`25`	`+ Ok(vm.ctx.intern_static_str(REPR).to_owned())`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`#[cold]`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ impl<'a> AsPyStr<'a> for &'a PyStrRef {`
`174`	`174`	`impl AsPyStr<'static> for &'static str {`
`175`	`175`	`#[inline]`
`176`	`176`	`fn as_pystr(self, ctx: &Context) -> &'static Py<PyStr> {`
`177`		`- ctx.intern_str(self)`
	`177`	`+ ctx.intern_static_str(self)`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`