Remove some unnecessary protections against Emacs bug #31238

Author: ubolonton

src/types/float.rs

@@ -8,6 +8,6 @@ impl FromLisp<'_> for f64 {
 
 impl IntoLisp<'_> for f64 {
     fn into_lisp(self, env: &Env) -> Result<Value<'_>> {
-        unsafe_raw_call_value!(env, make_float, self)
+        unsafe_raw_call_value_unprotected!(env, make_float, self)
     }
 }

src/types/integer.rs

@@ -39,7 +39,7 @@ int_from_lisp!(usize);
 
 impl IntoLisp<'_> for i64 {
     fn into_lisp(self, env: &Env) -> Result<Value<'_>> {
-        unsafe_raw_call_value!(env, make_integer, self)
+        unsafe_raw_call_value_unprotected!(env, make_integer, self)
     }
 }
 

src/types/vector.rs

@@ -41,8 +41,11 @@ impl<'e> Vector<'e> {
     pub fn get<T: FromLisp<'e>>(&self, i: usize) -> Result<T> {
         let v = self.value;
         let env = v.env;
-        // Safety: Same lifetime. Emacs does bound checking.
-        unsafe_raw_call_value!(env, vec_get, v.raw, i as isize)?.into_rust()
+        // Safety:
+        // - Same lifetime.
+        // - Emacs does bound checking.
+        // - Value doesn't need protection because we are done with it while the vector still lives.
+        unsafe_raw_call_value_unprotected!(env, vec_get, v.raw, i as isize)?.into_rust()
     }
 
     pub fn set<T: IntoLisp<'e>>(&self, i: usize, value: T) -> Result<()> {

test-module/src/test_lifetime.rs

@@ -57,6 +57,22 @@ fn gc_after_new_string(env: &Env) -> Result<Value<'_>> {
     }, print)
 }
 
+// Primitive types supposedly have no issue.
+#[defun(mod_in_name = false)]
+fn gc_after_new_int(env: &Env) -> Result<Value<'_>> {
+    create_collect_use(env, 2, || {
+        5.into_lisp(env)
+    }, print)
+}
+
+// Primitive types supposedly have no issue.
+#[defun(mod_in_name = false)]
+fn gc_after_new_float(env: &Env) -> Result<Value<'_>> {
+    create_collect_use(env, 2, || {
+        5.8.into_lisp(env)
+    }, print)
+}
+
 // Before fixing:
 // - macOS: Segmentation fault
 // - Linux: Segmentation fault

test-module/tests/main.el

@@ -297,6 +297,8 @@
    (lambda () (error "abc"))))
 
 (destructive-test gc-after-new-string lifetime)
+(destructive-test gc-after-new-int lifetime)
+(destructive-test gc-after-new-float lifetime)
 (destructive-test gc-after-uninterning lifetime)
 (destructive-test gc-after-retrieving lifetime)
 (destructive-test gc-after-catching lifetime)