Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions tests/langtest_lua.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(exit_status_error)]

use inner::main;

#[cfg(cargo_profile = "debug")]
Expand Down Expand Up @@ -49,7 +47,7 @@ mod inner {
// more than one copy.
let mut rsync_cmd = Command::new("rsync");
rsync_cmd.args(["-a", YKLUA_SUBMODULE_PATH, yklua_tgt_dir.to_str().unwrap()]);
rsync_cmd.status().unwrap().exit_ok().unwrap();
assert!(rsync_cmd.status().unwrap().success());

// cargo can sometimes run multiple builds in parallel. At the moment that's probably only
// build scripts, though that doesn't seem to be precisely specified and might change in the
Expand Down
2 changes: 1 addition & 1 deletion ykrt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#![cfg_attr(test, feature(test))]
#![feature(box_patterns)]
#![feature(int_roundings)]
#![feature(trim_prefix_suffix)]
#![cfg_attr(test, feature(trim_prefix_suffix))]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see!

#![feature(thread_local)]
#![allow(clippy::too_many_arguments)]
#![allow(clippy::type_complexity)]
Expand Down
3 changes: 2 additions & 1 deletion ykrt/src/mt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -339,18 +339,19 @@ impl MT {
mt.compiled_traces
.lock()
.insert(ctr.ctrid(), Arc::clone(&ctr));
mt.stats.trace_compiled_ok();
match trace_start {
TraceStart::ControlPoint { hl } => {
let mut lk = hl.lock();
assert_matches!(lk.kind, HotLocationKind::Compiling(_));
lk.kind = HotLocationKind::Compiled(ctr);
drop(lk);
mt.job_queue.notify_success(ctrid);
}
TraceStart::Guard { parent_ctr, gid } => {
parent_ctr.guard(gid).set_ctr(ctr, &parent_ctr, gid);
}
}
mt.stats.trace_compiled_ok();
}
Err(e) => {
mt.stats.trace_compiled_err();
Expand Down