From 0788da5dc80451b673b855dd98eb1ff6d03f3b58 Mon Sep 17 00:00:00 2001
From: Laurence Tratt <laurie@tratt.net>
Date: Fri, 9 Feb 2024 08:14:43 +0000
Subject: [PATCH 1/2] Remove unnecessary import and dependency.

---
 tests/Cargo.toml | 2 --
 tests/src/lib.rs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 4420556ba..d213def31 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -27,13 +27,11 @@ regex = "1.9"
 tempfile = "3.9.0"
 ykbuild = { path = "../ykbuild" }
 ykrt = { path = "../ykrt", features = ["yk_testing", "yk_jitstate_debug"] }
-yktracec = { path = "../yktracec", features = ["yk_testing"] }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["html_reports"] }
 lang_tester = "0.8"
 ykcapi = { path = "../ykcapi", features = ["yk_testing"] }
-yktracec = { path = "../yktracec", features = ["yk_testing"] }
 ykrt = { path = "../ykrt", features = ["yk_testing", "yk_jitstate_debug"] }
 
 [build-dependencies]
diff --git a/tests/src/lib.rs b/tests/src/lib.rs
index 1cf11b79c..7eed59ccb 100644
--- a/tests/src/lib.rs
+++ b/tests/src/lib.rs
@@ -12,8 +12,6 @@ use std::{
 };
 use ykbuild::ykllvm_bin;
 
-pub use yktracec::promote::__yk_lookup_promote_usize;
-
 const TEMPDIR_SUBST: &str = "%%TEMPDIR%%";
 pub static EXTRA_LINK: LazyLock<HashMap<&'static str, Vec<ExtraLinkage>>> = LazyLock::new(|| {
     let mut map = HashMap::new();

From a6e30d1db017eeff03294c35be1aa23378e153db Mon Sep 17 00:00:00 2001
From: Laurence Tratt <laurie@tratt.net>
Date: Fri, 9 Feb 2024 08:15:43 +0000
Subject: [PATCH 2/2] Move `promote.rs` from yktracec to ykrt.

Promotion is a run-time concept that can be used by multiple backends,
so it doesn't make sense for it to live in yktracec.
---
 ykrt/src/lib.rs                   | 1 +
 ykrt/src/mt.rs                    | 2 +-
 {yktracec => ykrt}/src/promote.rs | 0
 yktracec/src/lib.rs               | 2 --
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename {yktracec => ykrt}/src/promote.rs (100%)

diff --git a/ykrt/src/lib.rs b/ykrt/src/lib.rs
index fd78cbb1f..7298d91bb 100644
--- a/ykrt/src/lib.rs
+++ b/ykrt/src/lib.rs
@@ -13,6 +13,7 @@ mod deopt;
 mod frame;
 mod location;
 pub(crate) mod mt;
+pub mod promote;
 pub(crate) mod thread_intercept;
 pub mod trace;
 mod ykstats;
diff --git a/ykrt/src/mt.rs b/ykrt/src/mt.rs
index 4318a74d7..1e061f052 100644
--- a/ykrt/src/mt.rs
+++ b/ykrt/src/mt.rs
@@ -27,10 +27,10 @@ use crate::print_jit_state;
 use crate::{
     compile::{default_compiler, CompilationError, CompiledTrace, Compiler, GuardId},
     location::{HotLocation, HotLocationKind, Location, TraceFailed},
+    promote,
     trace::{default_tracer, AOTTraceIterator, TraceCollector, Tracer},
     ykstats::{TimingState, YkStats},
 };
-use yktracec::promote;
 
 // The HotThreshold must be less than a machine word wide for [`Location::Location`] to do its
 // pointer tagging thing. We therefore choose a type which makes this statically clear to
diff --git a/yktracec/src/promote.rs b/ykrt/src/promote.rs
similarity index 100%
rename from yktracec/src/promote.rs
rename to ykrt/src/promote.rs
diff --git a/yktracec/src/lib.rs b/yktracec/src/lib.rs
index 182029e26..4dff6a46e 100644
--- a/yktracec/src/lib.rs
+++ b/yktracec/src/lib.rs
@@ -9,8 +9,6 @@
 use libc::{c_void, size_t};
 use std::ffi::{c_char, c_int};
 
-pub mod promote;
-
 extern "C" {
     pub fn __yktracec_irtrace_compile(
         func_names: *const *const c_char,