From 33db8f97b6a2a7ebb30d38c3baf1fd2a6a1f9982 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Thu, 25 Jul 2024 05:27:19 +0000 Subject: [PATCH 1/2] Update to MMTk core PR #1176 --- mmtk/Cargo.lock | 4 ++-- mmtk/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index e1e7d10..786060c 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -425,7 +425,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.26.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=a3a72f8e5795678eff06fdc1524f0b429a62ccc0#a3a72f8e5795678eff06fdc1524f0b429a62ccc0" +source = "git+https://github.com/k-sareen/mmtk-core.git?rev=d573a35531f8e1ccc69823a5288e9c54ceef485a#d573a35531f8e1ccc69823a5288e9c54ceef485a" dependencies = [ "atomic", "atomic-traits", @@ -460,7 +460,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.26.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=a3a72f8e5795678eff06fdc1524f0b429a62ccc0#a3a72f8e5795678eff06fdc1524f0b429a62ccc0" +source = "git+https://github.com/k-sareen/mmtk-core.git?rev=d573a35531f8e1ccc69823a5288e9c54ceef485a#d573a35531f8e1ccc69823a5288e9c54ceef485a" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index f31b25f..8545b72 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -27,10 +27,10 @@ log = "*" # - change branch # - 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 = "a3a72f8e5795678eff06fdc1524f0b429a62ccc0" } +mmtk = { git = "https://github.com/k-sareen/mmtk-core.git", rev = "d573a35531f8e1ccc69823a5288e9c54ceef485a" } # Uncomment the following and fix the path to mmtk-core to build locally # mmtk = { path = "../repos/mmtk-core" } [features] -default = ["mmtk/code_space", "mmtk/ro_space"] +default = ["mmtk/code_space", "mmtk/ro_space", "mmtk/exec_permission_on_all_spaces"] nogc = [] From 649d0ab058851bd669d34cb56d49ab7d199d7df5 Mon Sep 17 00:00:00 2001 From: mmtkgc-bot Date: Fri, 26 Jul 2024 03:58:50 +0000 Subject: [PATCH 2/2] Update mmtk-core to 9a49d6a938f0c3143750e8415622dfe679b3ddb8 --- mmtk/Cargo.lock | 4 ++-- mmtk/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index 786060c..944c0f2 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -425,7 +425,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.26.0" -source = "git+https://github.com/k-sareen/mmtk-core.git?rev=d573a35531f8e1ccc69823a5288e9c54ceef485a#d573a35531f8e1ccc69823a5288e9c54ceef485a" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=9a49d6a938f0c3143750e8415622dfe679b3ddb8#9a49d6a938f0c3143750e8415622dfe679b3ddb8" dependencies = [ "atomic", "atomic-traits", @@ -460,7 +460,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.26.0" -source = "git+https://github.com/k-sareen/mmtk-core.git?rev=d573a35531f8e1ccc69823a5288e9c54ceef485a#d573a35531f8e1ccc69823a5288e9c54ceef485a" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=9a49d6a938f0c3143750e8415622dfe679b3ddb8#9a49d6a938f0c3143750e8415622dfe679b3ddb8" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 8545b72..4c374de 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -27,7 +27,7 @@ log = "*" # - change branch # - change repo name # But other changes including adding/removing whitespaces in commented lines may break the CI. -mmtk = { git = "https://github.com/k-sareen/mmtk-core.git", rev = "d573a35531f8e1ccc69823a5288e9c54ceef485a" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "9a49d6a938f0c3143750e8415622dfe679b3ddb8" } # Uncomment the following and fix the path to mmtk-core to build locally # mmtk = { path = "../repos/mmtk-core" }