Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix segfault in variables tests #641

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Fix segfault in variables tests #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15b9759
Fix tests random crashes
dfalbel Nov 25, 2024
9aa5d05
Remove possibly problematic `impl Into<SEXP>`.
dfalbel Nov 27, 2024
94eba52
Switch to RObject ref
dfalbel Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions crates/ark/src/variables/variable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,7 +1864,8 @@ mod tests {

fn inspect_from_expr(code: &str) -> Vec<Variable> {
let env = Environment::new(harp::parse_eval_base("new.env(parent = emptyenv())").unwrap());
env.bind("x".into(), harp::parse_eval_base(code).unwrap());
let value = harp::parse_eval_base(code).unwrap();
env.bind("x".into(), &value);
// Inspect the S4 object
let path = vec![String::from("x")];
PositronVariable::inspect(env.into(), &path).unwrap()
Expand Down Expand Up @@ -1971,10 +1972,8 @@ mod tests {
fn test_truncation_on_matrices() {
r_task(|| {
let env = Environment::new_empty().unwrap();
env.bind(
"x".into(),
harp::parse_eval_base("matrix(0, nrow = 10000, ncol = 10000)").unwrap(),
);
let value = harp::parse_eval_base("matrix(0, nrow = 10000, ncol = 10000)").unwrap();
env.bind("x".into(), &value);

// Inspect the matrix, we should see the list of columns truncated
let path = vec![String::from("x")];
Expand All @@ -1993,10 +1992,8 @@ mod tests {
fn test_string_truncation() {
r_task(|| {
let env = Environment::new_empty().unwrap();
env.bind(
"x".into(),
harp::parse_eval_base("paste(1:5e6, collapse = ' - ')").unwrap(),
);
let value = harp::parse_eval_base("paste(1:5e6, collapse = ' - ')").unwrap();
env.bind("x".into(), &value);

let path = vec![];
let vars = PositronVariable::inspect(env.into(), &path).unwrap();
Expand All @@ -2006,7 +2003,8 @@ mod tests {

// Test for the empty string
let env = Environment::new_empty().unwrap();
env.bind("x".into(), harp::parse_eval_base("''").unwrap());
let value = harp::parse_eval_base("''").unwrap();
env.bind("x".into(), &value);

let path = vec![];
let vars = PositronVariable::inspect(env.into(), &path).unwrap();
Expand All @@ -2015,10 +2013,8 @@ mod tests {

// Test for the single elment matrix, but with a large character
let env = Environment::new_empty().unwrap();
env.bind(
"x".into(),
harp::parse_eval_base("matrix(paste(1:5e6, collapse = ' - '))").unwrap(),
);
let value = harp::parse_eval_base("matrix(paste(1:5e6, collapse = ' - '))").unwrap();
env.bind("x".into(), &value);
let path = vec![];
let vars = PositronVariable::inspect(env.into(), &path).unwrap();
assert_eq!(vars.len(), 1);
Expand All @@ -2027,10 +2023,8 @@ mod tests {

// Test for the empty matrix
let env = Environment::new_empty().unwrap();
env.bind(
"x".into(),
harp::parse_eval_base("matrix(NA, ncol = 0, nrow = 0)").unwrap(),
);
let value = harp::parse_eval_base("matrix(NA, ncol = 0, nrow = 0)").unwrap();
env.bind("x".into(), &value);
let path = vec![];
let vars = PositronVariable::inspect(env.into(), &path).unwrap();
assert_eq!(vars.len(), 1);
Expand Down
6 changes: 3 additions & 3 deletions crates/harp/src/environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ impl Environment {
std::iter::successors(Some(self.clone()), |p| p.parent())
}

pub fn bind(&self, name: RSymbol, value: impl Into<SEXP>) {
pub fn bind(&self, name: RSymbol, value: &RObject) {
unsafe {
Rf_defineVar(name.sexp, value.into(), self.inner.sexp);
Rf_defineVar(name.sexp, value.sexp, self.inner.sexp);
}
}

pub fn force_bind(&self, name: RSymbol, value: impl Into<SEXP>) {
pub fn force_bind(&self, name: RSymbol, value: &RObject) {
let locked = self.is_locked_binding(name);
if locked {
self.unlock_binding(name);
Expand Down
12 changes: 7 additions & 5 deletions crates/harp/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,8 +673,9 @@ pub fn save_rds(x: SEXP, path: &str) {
let path = RObject::from(path);

let env = Environment::new(harp::parse_eval_base("new.env()").unwrap());
env.bind("x".into(), x);
env.bind("path".into(), path);
let x = RObject::from(x);
env.bind("x".into(), &x);
env.bind("path".into(), &path);

let res = harp::parse_eval0("base::saveRDS(x, path)", env);

Expand All @@ -701,9 +702,10 @@ pub fn push_rds(x: SEXP, path: &str, context: &str) {

let env = Environment::new(harp::parse_eval_base("new.env()").unwrap());

env.bind("x".into(), x);
env.bind("path".into(), path);
env.bind("context".into(), context);
let x = RObject::from(x);
env.bind("x".into(), &x);
env.bind("path".into(), &path);
env.bind("context".into(), &context);

let res = harp::parse_eval0(".ps.internal(push_rds(x, path, context))", env);

Expand Down
Loading