Have zero working with no barrier

Author: caizixian

mmtk/Cargo.toml

@@ -58,3 +58,5 @@ gencopy = []
 marksweep = []
 pageprotect = []
 immix = []
+
+jfr = []

mmtk/src/abi.rs

@@ -66,6 +66,7 @@ pub struct Klass {
     pub class_loader_data: OpaquePointer, // ClassLoaderData*
     pub vtable_len: i32,
     pub access_flags: i32, // AccessFlags
+    #[cfg(feature = "jfr")]
     pub trace_id: u64,     // JFR_ONLY(traceid _trace_id;)
     pub shared_class_flags: u16,
     pub archived_mirror_index: i32,

openjdk/CompileThirdPartyHeap.gmk

@@ -38,6 +38,14 @@ ifeq ($(MMTK_EXTREME_ASSERTIONS), 1)
   endif
 endif
 
+ifeq ($(call check-jvm-feature, jfr), true)
+  ifndef GC_FEATURES
+    GC_FEATURES=--features jfr
+  else
+    GC_FEATURES:=$(strip $(GC_FEATURES))",jfr"
+  endif
+endif
+
 LIB_MMTK := $(JVM_LIB_OUTPUTDIR)/libmmtk_openjdk.so
 
 ifeq ($(DEBUG_LEVEL), release)

openjdk/barriers/mmtkNoBarrier.hpp

@@ -3,16 +3,27 @@
 
 #include "../mmtkBarrierSet.hpp"
 #include "../mmtkBarrierSetAssembler_x86.hpp"
+#ifdef COMPILER1
 #include "../mmtkBarrierSetC1.hpp"
+class MMTkNoBarrierSetC1: public MMTkBarrierSetC1 {};
+#else
+class MMTkNoBarrierSetC1;
+#endif
+
+#ifdef COMPILER2
 #include "../mmtkBarrierSetC2.hpp"
+class MMTkNoBarrierSetC2: public MMTkBarrierSetC2 {};
+#else
+class MMTkNoBarrierSetC2;
+#endif
 
 class MMTkNoBarrierSetRuntime: public MMTkBarrierSetRuntime {};
 
+#ifndef ZERO
 class MMTkNoBarrierSetAssembler: public MMTkBarrierSetAssembler {};
-
-class MMTkNoBarrierSetC1: public MMTkBarrierSetC1 {};
-
-class MMTkNoBarrierSetC2: public MMTkBarrierSetC2 {};
+#else
+class MMTkNoBarrierSetAssembler;
+#endif
 
 struct MMTkNoBarrier: MMTkBarrierImpl<
   MMTkNoBarrierSetRuntime,