From 896a3dc54191b09126b98a677f5ad0e16f7c0db4 Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Fri, 1 Apr 2022 23:53:55 +1300
Subject: [PATCH] Bump version to v0.11. Add MSRV. (#107)

---
 .github/workflows/ci.yml | 12 ++++++++++++
 CHANGELOG.md             | 11 +++++++++++
 README.md                |  8 ++------
 mmtk/Cargo.toml          |  5 +++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e6d307b..28261ba9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,18 @@ jobs:
       - name: Dacapo Tests
         run: ./.github/scripts/ci-test-normal.sh
 
+      # Run these checks after build
+
       # Style check
       - name: Style checks
         run: ./.github/scripts/ci-style.sh
+
+      # Verify the MSRV defined in Cargo.toml
+      - name: Install MSRV
+        run: cargo install cargo-msrv
+      - name: Verify MSRV
+        run: cargo msrv --path mmtk verify -- cargo check --features semispace --target i686-unknown-linux-gnu
+      # If the previous step fails, find MSRV
+      - name: Find MSRV
+        if: failure()
+        run: cargo msrv --path mmtk -- cargo check --features semispace --target i686-unknown-linux-gnu
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f72ad38..c5e05aab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,20 @@
+0.11.0 (2022-04-01)
+===
+
+* The JikesRVM submodule is removed from the repo. We now record the VM version
+  in `[package.metadata.jikesrvm]` in the Cargo manifest `Cargo.toml`.
+* Sets `ObjectModel::OBJECT_REF_OFFSET_BEYOND_CELL` so MMTk can guarantee metadata is set properly
+  for object references.
+* Updates to mmtk-core 0.11.0.
+
 0.10.0 (2022-02-14)
 ===
+
 * Updates to mmtk-core 0.10.0.
 
 0.9.0 (2021-12-16)
 ===
+
 * Updates to mmtk-core 0.9.0.
 
 0.8.0 (2021-11-01)
diff --git a/README.md b/README.md
index 808ad1ba..33b9204f 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,8 @@ MMTk/JikesRVM supports `linux-i686` and `linux-x86_64` (as a 32-bit program).
 
 If you use the set-up explained in [mmtk-dev-env](https://github.com/mmtk/mmtk-dev-env), make sure to do the following steps before continuing to the [Build](#build) section:
 
-1. Set the default Rust toolchain to the one specified in [mmtk-dev-env](https://github.com/mmtk/mmtk-dev-env), e.g. by running:
-
-```console
-$ # replace nightly-YYYY-MM-DD with the toolchain specified in mmtk-dev-env
-$ export RUSTUP_TOOLCHAIN=nightly-YYYY-MM-DD
-```
+1. Use a proper Rust toolchain. The minimal supported Rust version for MMTk-JikesRVM binding is 1.59.0 (for the stablization of inline assembly). Make sure your Rust version is higher than this. We test MMTk-JikesRVM
+binding with Rust 1.59.0 (as specified in [`rust-toolchain`](mmtk/rust-toolchain)).
 
 2. Set `openjdk-8-jdk` as the default JDK (openjdk-8-jdk is a build requirement of JikesRVM), e.g. by running:
 
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index c402ba66..7fa0f547 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "mmtk_jikesrvm"
-version = "0.10.0"
+version = "0.11.0"
 authors = [" <>"]
+rust-version = "1.59.0"
 
 [lib]
 name = "mmtk_jikesrvm"
@@ -27,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 = "cacded40b7622e97dea56a83179aaa6af42920d0" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "be96a270815c0f20a169a7214eebccfe50484be4" }
 # 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" }