DescrObject::name to PyStrInterned

youknowone · youknowone · commit c3491ebdc386 · 2023-04-10T09:53:54.000+09:00
diff --git a/vm/src/builtins/descriptor.rs b/vm/src/builtins/descriptor.rs
@@ -1,4 +1,4 @@
-use super::{PyStr, PyType, PyTypeRef};
+use super::{PyStr, PyStrInterned, PyType, PyTypeRef};
 use crate::{
     class::PyClassImpl,
     function::PySetterValue,
@@ -10,7 +10,7 @@ use rustpython_common::lock::PyRwLock;
 #[derive(Debug)]
 pub struct DescrObject {
     pub typ: PyTypeRef,
-    pub name: String,
+    pub name: &'static PyStrInterned,
     pub qualname: PyRwLock<Option<String>>,
 }
 
diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -793,8 +793,8 @@ impl PyType {
                 let member_descriptor: PyRef<MemberDescrObject> =
                     vm.ctx.new_pyref(MemberDescrObject {
                         common: DescrObject {
-                            typ: typ.to_owned(),
-                            name: member.to_string(),
+                            typ: typ.clone(),
+                            name: vm.ctx.intern_str(member.as_str()),
                             qualname: PyRwLock::new(None),
                         },
                         member: member_def,
diff --git a/vm/src/vm/context.rs b/vm/src/vm/context.rs
@@ -515,7 +515,7 @@ impl Context {
         let member_descriptor = MemberDescrObject {
             common: DescrObject {
                 typ: class.to_owned(),
-                name: name.to_owned(),
+                name: self.intern_str(name),
                 qualname: PyRwLock::new(None),
             },
             member: member_def,
