From 588dced56817b6544dceef3ed94a047f754f68f2 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Fri, 20 Feb 2026 00:17:35 +0000 Subject: [PATCH 1/5] Adapt to dyanmic side metadata address --- .github/scripts/pgo-build.sh | 5 ++++- mmtk/Cargo.lock | 4 ++-- mmtk/Cargo.toml | 2 +- mmtk/src/lib.rs | 15 +++++++++------ .../mmtkUnlogBitBarrierSetAssembler_aarch64.cpp | 4 ++-- openjdk/cpu/x86/mmtkBarrierSetAssembler_x86.cpp | 4 ++-- .../x86/mmtkUnlogBitBarrierSetAssembler_x86.cpp | 4 ++-- openjdk/share/barriers/mmtkUnlogBitBarrier.cpp | 6 +++--- openjdk/share/barriers/mmtkUnlogBitBarrier.hpp | 6 ++++-- openjdk/share/mmtk.h | 6 +++--- openjdk/share/mmtkBarrierSet.hpp | 4 +++- openjdk/share/mmtkBarrierSetC2.cpp | 4 ++-- 12 files changed, 37 insertions(+), 27 deletions(-) diff --git a/.github/scripts/pgo-build.sh b/.github/scripts/pgo-build.sh index f5d0785b..eea0cc70 100755 --- a/.github/scripts/pgo-build.sh +++ b/.github/scripts/pgo-build.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -ex # PGO seems to have problems with incremental compilation or something else similar. # PGO build might fail with error messages such as @@ -10,6 +11,8 @@ pushd ../mmtk-openjdk/mmtk cargo clean popd +sh configure --disable-warnings-as-errors --with-debug-level=release + # Compile with profiling support RUSTFLAGS="-Cprofile-generate=/tmp/$USER/pgo-data" make CONF=linux-x86_64-server-release THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk images @@ -20,7 +23,7 @@ rm -rf /tmp/$USER/pgo-data/* MMTK_PLAN=GenImmix MMTK_STRESS_FACTOR=4194304 MMTK_PRECISE_STRESS=false ./build/linux-x86_64-server-release/images/jdk/bin/java -XX:MetaspaceSize=500M -XX:+DisableExplicitGC -XX:-TieredCompilation -Xcomp -XX:+UseThirdPartyHeap -Xms60M -Xmx60M -jar /usr/share/benchmarks/dacapo/dacapo-23.11-MR2-chopin.jar -n 5 fop # Merge profiling data -/opt/rust/toolchains/1.83.0-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o /tmp/$USER/pgo-data/merged.profdata /tmp/$USER/pgo-data +/opt/rust/toolchains/1.92.0-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o /tmp/$USER/pgo-data/merged.profdata /tmp/$USER/pgo-data pushd ../mmtk-openjdk/mmtk cargo clean diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index 67fc3bce..c85e12e4 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -494,7 +494,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.32.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=105661429473dc141f940e981c04dc86e995daaa#105661429473dc141f940e981c04dc86e995daaa" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=39377a5d71df799ddc34199b57179777a9e96441#39377a5d71df799ddc34199b57179777a9e96441" dependencies = [ "atomic", "atomic-traits", @@ -530,7 +530,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.32.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=105661429473dc141f940e981c04dc86e995daaa#105661429473dc141f940e981c04dc86e995daaa" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=39377a5d71df799ddc34199b57179777a9e96441#39377a5d71df799ddc34199b57179777a9e96441" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 59e65a01..243fce0d 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -36,7 +36,7 @@ probe = "0.5" # - 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 = "105661429473dc141f940e981c04dc86e995daaa" } +mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "39377a5d71df799ddc34199b57179777a9e96441" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } diff --git a/mmtk/src/lib.rs b/mmtk/src/lib.rs index 48e3bb39..9bff198c 100644 --- a/mmtk/src/lib.rs +++ b/mmtk/src/lib.rs @@ -118,16 +118,19 @@ pub struct OpenJDK_Upcalls { pub static mut UPCALLS: *const OpenJDK_Upcalls = null_mut(); #[no_mangle] -pub static GLOBAL_SIDE_METADATA_BASE_ADDRESS: uintptr_t = - mmtk::util::metadata::side_metadata::GLOBAL_SIDE_METADATA_BASE_ADDRESS.as_usize(); +pub extern "C" fn get_global_side_metadata_base_address() -> uintptr_t { + mmtk::util::metadata::side_metadata::global_side_metadata_base_address().as_usize() +} #[no_mangle] -pub static GLOBAL_SIDE_METADATA_VM_BASE_ADDRESS: uintptr_t = - mmtk::util::metadata::side_metadata::GLOBAL_SIDE_METADATA_VM_BASE_ADDRESS.as_usize(); +pub extern "C" fn get_global_side_metadata_vm_base_address() -> uintptr_t { + mmtk::util::metadata::side_metadata::global_side_metadata_vm_base_address().as_usize() +} #[no_mangle] -pub static VO_BIT_ADDRESS: uintptr_t = - mmtk::util::metadata::side_metadata::VO_BIT_SIDE_METADATA_ADDR.as_usize(); +pub extern "C" fn get_vo_bit_address() -> uintptr_t { + mmtk::util::metadata::side_metadata::vo_bit_side_metadata_addr().as_usize() +} #[no_mangle] pub static FREE_LIST_ALLOCATOR_SIZE: uintptr_t = diff --git a/openjdk/cpu/aarch64/mmtkUnlogBitBarrierSetAssembler_aarch64.cpp b/openjdk/cpu/aarch64/mmtkUnlogBitBarrierSetAssembler_aarch64.cpp index 223e4f31..32b5e6b5 100644 --- a/openjdk/cpu/aarch64/mmtkUnlogBitBarrierSetAssembler_aarch64.cpp +++ b/openjdk/cpu/aarch64/mmtkUnlogBitBarrierSetAssembler_aarch64.cpp @@ -17,8 +17,8 @@ void MMTkUnlogBitBarrierSetAssembler::emit_check_unlog_bit_fast_path(MacroAssemb // not the `tmp1` and `tmp2` from `store_at`. assert_different_registers(obj, tmp1, tmp2, tmp3); - // tmp2 = load-byte (UNLOG_BIT_BASE_ADDRESS + (obj >> 6)); - __ movptr(tmp1, (intptr_t)UNLOG_BIT_BASE_ADDRESS); + // tmp2 = load-byte (unlog_bit_base_address() + (obj >> 6)); + __ movptr(tmp1, (intptr_t)unlog_bit_base_address()); __ add(tmp2, tmp1, obj, Assembler::LSR, 6); // tmp1 = (obj >> 3) & 7 __ movz(tmp1, 7); diff --git a/openjdk/cpu/x86/mmtkBarrierSetAssembler_x86.cpp b/openjdk/cpu/x86/mmtkBarrierSetAssembler_x86.cpp index 82fd873f..526b0a6f 100644 --- a/openjdk/cpu/x86/mmtkBarrierSetAssembler_x86.cpp +++ b/openjdk/cpu/x86/mmtkBarrierSetAssembler_x86.cpp @@ -112,7 +112,7 @@ void MMTkBarrierSetAssembler::eden_allocate(MacroAssembler* masm, Register threa // tmp2 = load-byte (SIDE_METADATA_BASE_ADDRESS + (obj >> 6)); __ movptr(tmp3, obj); __ shrptr(tmp3, 6); - __ movptr(tmp2, VO_BIT_BASE_ADDRESS); + __ movptr(tmp2, vo_bit_base_address()); __ movb(tmp2, Address(tmp2, tmp3)); // tmp3 = 1 << ((obj >> 3) & 7) // 1. rcx = (obj >> 3) & 7 @@ -128,7 +128,7 @@ void MMTkBarrierSetAssembler::eden_allocate(MacroAssembler* masm, Register threa // store-byte tmp2 (SIDE_METADATA_BASE_ADDRESS + (obj >> 6)) __ movptr(tmp3, obj); __ shrptr(tmp3, 6); - __ movptr(rcx, VO_BIT_BASE_ADDRESS); + __ movptr(rcx, vo_bit_base_address()); __ movb(Address(rcx, tmp3), tmp2); } diff --git a/openjdk/cpu/x86/mmtkUnlogBitBarrierSetAssembler_x86.cpp b/openjdk/cpu/x86/mmtkUnlogBitBarrierSetAssembler_x86.cpp index c7148098..4c3a28f0 100644 --- a/openjdk/cpu/x86/mmtkUnlogBitBarrierSetAssembler_x86.cpp +++ b/openjdk/cpu/x86/mmtkUnlogBitBarrierSetAssembler_x86.cpp @@ -17,10 +17,10 @@ void MMTkUnlogBitBarrierSetAssembler::emit_check_unlog_bit_fast_path(MacroAssemb // not the `tmp1` and `tmp2` from `store_at`. assert_different_registers(obj, tmp1, tmp2, tmp3); - // tmp2 = load-byte (UNLOG_BIT_BASE_ADDRESS + (obj >> 6)); + // tmp2 = load-byte (unlog_bit_base_address() + (obj >> 6)); __ movptr(tmp1, obj); __ shrptr(tmp1, 6); - __ movptr(tmp2, (intptr_t)UNLOG_BIT_BASE_ADDRESS); + __ movptr(tmp2, (intptr_t)unlog_bit_base_address()); __ movb(tmp2, Address(tmp2, tmp1)); // tmp1 = (obj >> 3) & 7 __ movptr(tmp1, obj); diff --git a/openjdk/share/barriers/mmtkUnlogBitBarrier.cpp b/openjdk/share/barriers/mmtkUnlogBitBarrier.cpp index 6feae3db..aaa133c4 100644 --- a/openjdk/share/barriers/mmtkUnlogBitBarrier.cpp +++ b/openjdk/share/barriers/mmtkUnlogBitBarrier.cpp @@ -30,12 +30,12 @@ void MMTkUnlogBitBarrierSetC1::emit_check_unlog_bit_fast_path(LIRGenerator* gen, LIR_Opr addr = gen->new_register(T_OBJECT); __ move(src, addr); - // uint8_t* meta_addr = (uint8_t*) (UNLOG_BIT_BASE_ADDRESS + (addr >> 6)); + // uint8_t* meta_addr = (uint8_t*) (unlog_bit_base_address() + (addr >> 6)); LIR_Opr offset = gen->new_pointer_register(); __ move(addr, offset); __ unsigned_shift_right(offset, 6, offset); LIR_Opr base = gen->new_pointer_register(); - __ move(LIR_OprFact::longConst(UNLOG_BIT_BASE_ADDRESS), base); + __ move(LIR_OprFact::longConst(unlog_bit_base_address()), base); LIR_Address* meta_addr = new LIR_Address(base, offset, T_BYTE); // uint8_t byte_val = *meta_addr; @@ -81,7 +81,7 @@ void MMTkUnlogBitBarrierSetC1::object_reference_write_pre_or_post(LIRAccess& acc Node* MMTkUnlogBitBarrierSetC2::emit_check_unlog_bit_fast_path(MMTkIdealKit& ideal, Node* obj) { Node* addr = __ CastPX(__ ctrl(), obj); Node* no_base = __ top(); - Node* meta_addr = __ AddP(no_base, __ ConP(UNLOG_BIT_BASE_ADDRESS), __ URShiftX(addr, __ ConI(6))); + Node* meta_addr = __ AddP(no_base, __ ConP(unlog_bit_base_address()), __ URShiftX(addr, __ ConI(6))); Node* byte = __ load(__ ctrl(), meta_addr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw); Node* shift = __ URShiftX(addr, __ ConI(3)); shift = __ AndI(__ ConvL2I(shift), __ ConI(7)); diff --git a/openjdk/share/barriers/mmtkUnlogBitBarrier.hpp b/openjdk/share/barriers/mmtkUnlogBitBarrier.hpp index 539fc32b..afda80d7 100644 --- a/openjdk/share/barriers/mmtkUnlogBitBarrier.hpp +++ b/openjdk/share/barriers/mmtkUnlogBitBarrier.hpp @@ -9,7 +9,9 @@ struct MMTkC1UnlogBitBarrierSlowPathStub; -const uintptr_t UNLOG_BIT_BASE_ADDRESS = GLOBAL_SIDE_METADATA_VM_BASE_ADDRESS; +inline uintptr_t unlog_bit_base_address() { + return get_global_side_metadata_vm_base_address(); +} //////////////////// Runtime //////////////////// @@ -17,7 +19,7 @@ class MMTkUnlogBitBarrierSetRuntime: public MMTkBarrierSetRuntime { protected: static bool is_unlog_bit_set(oop obj) { uintptr_t addr = (uintptr_t) (void*) obj; - uint8_t* meta_addr = (uint8_t*) (UNLOG_BIT_BASE_ADDRESS + (addr >> 6)); + uint8_t* meta_addr = (uint8_t*) (unlog_bit_base_address() + (addr >> 6)); uintptr_t shift = (addr >> 3) & 0b111; uint8_t byte_val = *meta_addr; return ((byte_val >> shift) & 1) == 1; diff --git a/openjdk/share/mmtk.h b/openjdk/share/mmtk.h index d62d901c..eaff3d90 100644 --- a/openjdk/share/mmtk.h +++ b/openjdk/share/mmtk.h @@ -18,9 +18,9 @@ typedef enum { MmapOutOfMemory, } MMTkAllocationError; -extern const uintptr_t GLOBAL_SIDE_METADATA_BASE_ADDRESS; -extern const uintptr_t GLOBAL_SIDE_METADATA_VM_BASE_ADDRESS; -extern const uintptr_t VO_BIT_ADDRESS; +extern uintptr_t get_global_side_metadata_base_address(); +extern uintptr_t get_global_side_metadata_vm_base_address(); +extern uintptr_t get_vo_bit_address(); extern const size_t MMTK_MARK_COMPACT_HEADER_RESERVED_IN_BYTES; extern const uintptr_t FREE_LIST_ALLOCATOR_SIZE; extern uint8_t CONCURRENT_MARKING_ACTIVE; diff --git a/openjdk/share/mmtkBarrierSet.hpp b/openjdk/share/mmtkBarrierSet.hpp index 4f271a1e..7778faf9 100644 --- a/openjdk/share/mmtkBarrierSet.hpp +++ b/openjdk/share/mmtkBarrierSet.hpp @@ -43,7 +43,9 @@ extern bool mmtk_enable_allocation_fastpath; extern bool mmtk_enable_barrier_fastpath; extern bool mmtk_enable_reference_load_barrier; -const intptr_t VO_BIT_BASE_ADDRESS = VO_BIT_ADDRESS; +inline intptr_t vo_bit_base_address() { + return static_cast(get_vo_bit_address()); +} struct MMTkAllocatorOffsets { int tlab_top_offset; diff --git a/openjdk/share/mmtkBarrierSetC2.cpp b/openjdk/share/mmtkBarrierSetC2.cpp index dd7a970c..9fe6fff1 100644 --- a/openjdk/share/mmtkBarrierSetC2.cpp +++ b/openjdk/share/mmtkBarrierSetC2.cpp @@ -281,7 +281,7 @@ void MMTkBarrierSetC2::expand_allocate(PhaseMacroExpand* x, if (enable_vo_bit || selector.tag == TAG_MARK_COMPACT) { // set the alloc bit: // intptr_t addr = (intptr_t) (void*) fast_oop; - // uint8_t* meta_addr = (uint8_t*) (VO_BIT_BASE_ADDRESS + (addr >> 6)); + // uint8_t* meta_addr = (uint8_t*) (vo_bit_base_address() + (addr >> 6)); // intptr_t shift = (addr >> 3) & 0b111; // uint8_t byte_val = *meta_addr; // uint8_t new_byte_val = byte_val | (1 << shift); @@ -295,7 +295,7 @@ void MMTkBarrierSetC2::expand_allocate(PhaseMacroExpand* x, Node *meta_offset = new URShiftLNode(obj_addr, addr_shift); x->transform_later(meta_offset); - Node *meta_base = ConLNode::make(VO_BIT_BASE_ADDRESS); + Node *meta_base = ConLNode::make(vo_bit_base_address()); x->transform_later(meta_base); Node *meta_addr = new AddLNode(meta_base, meta_offset); From 82d3efbbd446909c73f054ea8e6f84347ed539d9 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Mon, 23 Feb 2026 03:23:42 +0000 Subject: [PATCH 2/5] Update mmtk-core --- 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 c85e12e4..15338f9e 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -494,7 +494,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.32.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=39377a5d71df799ddc34199b57179777a9e96441#39377a5d71df799ddc34199b57179777a9e96441" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe#1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe" dependencies = [ "atomic", "atomic-traits", @@ -530,7 +530,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.32.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=39377a5d71df799ddc34199b57179777a9e96441#39377a5d71df799ddc34199b57179777a9e96441" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe#1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 243fce0d..1cde8680 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -36,7 +36,7 @@ probe = "0.5" # - change branch # - change repo name # But other changes including adding/removing whitespaces in commented lines may break the CI. -mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "39377a5d71df799ddc34199b57179777a9e96441" } +mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } From 707bffaf9f2b056a2052304a32116e3c9ed58bcb Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 14 Apr 2026 03:49:56 +0000 Subject: [PATCH 3/5] Update mmtk-core --- 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 0e8f865b..75563b0f 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -582,7 +582,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.32.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe#1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=0d591e81380717a957c80fa76a81863d9d2be260#0d591e81380717a957c80fa76a81863d9d2be260" dependencies = [ "atomic", "atomic-traits", @@ -618,7 +618,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.32.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe#1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=0d591e81380717a957c80fa76a81863d9d2be260#0d591e81380717a957c80fa76a81863d9d2be260" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 1cde8680..89253653 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -36,7 +36,7 @@ probe = "0.5" # - change branch # - change repo name # But other changes including adding/removing whitespaces in commented lines may break the CI. -mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "1c5998dccf6e0fefba6a223bb05c16ac07ed5bfe" } +mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "0d591e81380717a957c80fa76a81863d9d2be260" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } From b13c18a05355749ae4a77d81b0f1a529255e9e8d Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 14 Apr 2026 03:50:55 +0000 Subject: [PATCH 4/5] Merge issue in pgo-build.sh --- .github/scripts/pgo-build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/scripts/pgo-build.sh b/.github/scripts/pgo-build.sh index 8afc20d5..8bc5773d 100755 --- a/.github/scripts/pgo-build.sh +++ b/.github/scripts/pgo-build.sh @@ -42,8 +42,6 @@ clean_binding_mmtk() { clean_binding_mmtk -sh configure --disable-warnings-as-errors --with-debug-level=release - # Compile with profiling support sh configure --disable-warnings-as-errors --with-debug-level=$OPENJDK_DEBUG_LEVEL RUSTFLAGS="-Cprofile-generate=$PROFILE_DATA_DIR" make CONF=$OPENJDK_CONFIG THIRD_PARTY_HEAP=$BINDING_OPENJDK_DIR images From fb1b44def9e308962308ffe5b2bc9d77f7513cf1 Mon Sep 17 00:00:00 2001 From: mmtkgc-bot Date: Thu, 16 Apr 2026 05:46:49 +0000 Subject: [PATCH 5/5] Update mmtk-core to 37d81218028d788f7a24158aac0588c3f6925d08 --- 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 75563b0f..106e4bee 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -582,7 +582,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.32.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=0d591e81380717a957c80fa76a81863d9d2be260#0d591e81380717a957c80fa76a81863d9d2be260" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=37d81218028d788f7a24158aac0588c3f6925d08#37d81218028d788f7a24158aac0588c3f6925d08" dependencies = [ "atomic", "atomic-traits", @@ -618,7 +618,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.32.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=0d591e81380717a957c80fa76a81863d9d2be260#0d591e81380717a957c80fa76a81863d9d2be260" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=37d81218028d788f7a24158aac0588c3f6925d08#37d81218028d788f7a24158aac0588c3f6925d08" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 89253653..9c7287b0 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -36,7 +36,7 @@ probe = "0.5" # - change branch # - change repo name # But other changes including adding/removing whitespaces in commented lines may break the CI. -mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "0d591e81380717a957c80fa76a81863d9d2be260" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "37d81218028d788f7a24158aac0588c3f6925d08" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" }