From ab7eee53f5a911e8ae7ed93988a02be98a339018 Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Thu, 24 Aug 2023 19:38:24 +1200
Subject: [PATCH] Bump version to v0.19 (#148)

---
 CHANGELOG.md        | 13 +++++++++++++
 mmtk/Cargo.lock     | 15 ++++++++-------
 mmtk/Cargo.toml     |  6 +++---
 mmtk/rust-toolchain |  2 +-
 mmtk/src/api.rs     |  4 ++--
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16909c45..5d77fe54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+0.19.0 (2023-08-18)
+===
+
+## What's Changed
+* Set VM space start and size through options by @qinsoon in https://github.com/mmtk/mmtk-jikesrvm/pull/139
+* Install the missing deps in CI tests by @qinsoon in https://github.com/mmtk/mmtk-jikesrvm/pull/140
+* Update to MMTk core PR #817 by @qinsoon in https://github.com/mmtk/mmtk-jikesrvm/pull/141
+* Update to mmtk-core PR #838 by @qinsoon in https://github.com/mmtk/mmtk-jikesrvm/pull/142
+* Rename ambiguous `scan_thread_root{,s}` functions by @k-sareen in https://github.com/mmtk/mmtk-jikesrvm/pull/143
+* Set `REFS` to 0 when starting the scan boot image by @k-sareen in https://github.com/mmtk/mmtk-jikesrvm/pull/144
+* Add set -e in ci-test.sh. Update MMTk by @qinsoon in https://github.com/mmtk/mmtk-jikesrvm/pull/146
+* Update to MMTk core PR #875 by @qinsoon in https://github.com/mmtk/mmtk-jikesrvm/pull/147
+
 0.18.0 (2023-04-03)
 ===
 
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index f4eece63..1bb5d705 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -399,8 +399,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk"
-version = "0.18.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=04a47feb4598b2120598453c2cceec83986c2122#04a47feb4598b2120598453c2cceec83986c2122"
+version = "0.19.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=269408b464d723b7f9f2d203e7b3ae220eb8edd9#269408b464d723b7f9f2d203e7b3ae220eb8edd9"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -417,6 +417,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "memoffset",
  "mmtk-macros",
  "num-traits",
  "num_cpus",
@@ -431,8 +432,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk-macros"
-version = "0.18.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=04a47feb4598b2120598453c2cceec83986c2122#04a47feb4598b2120598453c2cceec83986c2122"
+version = "0.19.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=269408b464d723b7f9f2d203e7b3ae220eb8edd9#269408b464d723b7f9f2d203e7b3ae220eb8edd9"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -442,7 +443,7 @@ dependencies = [
 
 [[package]]
 name = "mmtk_jikesrvm"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "lazy_static",
  "libc",
@@ -508,9 +509,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "probe"
-version = "0.3.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216e81fcf486280f0b8b18ca43ceafd32739eb0eb703eb024a8d00814eeba556"
+checksum = "d8e2d2444b730c8f027344c60f9e1f1554d7a3342df9bdd425142ed119a6e5a3"
 
 [[package]]
 name = "proc-macro-error"
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 835c6153..6c85ebbc 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "mmtk_jikesrvm"
-version = "0.18.0"
+version = "0.19.0"
 authors = [" <>"]
-rust-version = "1.61.0"
+rust-version = "1.66.0"
 
 [lib]
 name = "mmtk_jikesrvm"
@@ -28,7 +28,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
 # - change branch/rev
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "04a47feb4598b2120598453c2cceec83986c2122" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "269408b464d723b7f9f2d203e7b3ae220eb8edd9" }
 # Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
 # mmtk = { path = "../repos/mmtk-core" }
 
diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain
index 0403bed1..68bc7ff2 100644
--- a/mmtk/rust-toolchain
+++ b/mmtk/rust-toolchain
@@ -1 +1 @@
-1.66.1
+1.71.1
diff --git a/mmtk/src/api.rs b/mmtk/src/api.rs
index 7b78c532..7ba2fee5 100644
--- a/mmtk/src/api.rs
+++ b/mmtk/src/api.rs
@@ -307,7 +307,7 @@ pub extern "C" fn alloc_slow_bump_monotone_immortal(
 // FIXME: after we remove plan as build-time option, we should remove this conditional compilation as well.
 
 #[no_mangle]
-#[cfg(any(feature = "semispace"))]
+#[cfg(feature = "semispace")]
 pub extern "C" fn alloc_slow_bump_monotone_copy(
     allocator: *mut c_void,
     size: usize,
@@ -317,7 +317,7 @@ pub extern "C" fn alloc_slow_bump_monotone_copy(
     unsafe { &mut *(allocator as *mut BumpAllocator<JikesRVM>) }.alloc_slow(size, align, offset)
 }
 #[no_mangle]
-#[cfg(not(any(feature = "semispace")))]
+#[cfg(not(feature = "semispace"))]
 pub extern "C" fn alloc_slow_bump_monotone_copy(
     _allocator: *mut c_void,
     _size: usize,