Merge pull request #17300 from JasonFengJ9/umanocriu-v0.38

(v0.38.0-release) CRIU BytecodeInterpreter requires J9VM_OPT_CRIU_SUPPORT
eclipse-openj9 · Apr 27, 2023 · d57d059 · d57d059
2 parents 179edc0 + 8b70248
commit d57d059
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp b/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp
@@ -22,10 +22,10 @@
 
 #include "j9cfg.h"
 
-#if defined(OMR_GC_COMPRESSED_POINTERS)
+#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT)
 #define DO_HOOKS
 #define OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES 1
 #define LOOP_NAME criuBytecodeLoopCompressed
 #define INTERPRETER_CLASS VM_CRIUBytecodeInterpreterCompressed
 #include "BytecodeInterpreter.inc"
-#endif /* defined(OMR_GC_COMPRESSED_POINTERS) */
+#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT) */
diff --git a/runtime/vm/CRIUBytecodeInterpreterFull.cpp b/runtime/vm/CRIUBytecodeInterpreterFull.cpp
@@ -22,10 +22,10 @@
 
 #include "j9cfg.h"
 
-#if defined(OMR_GC_FULL_POINTERS)
+#if defined(OMR_GC_FULL_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT)
 #define DO_HOOKS
 #define OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES 0
 #define LOOP_NAME criuBytecodeLoopFull
 #define INTERPRETER_CLASS VM_CRIUBytecodeInterpreterFull
 #include "BytecodeInterpreter.inc"
-#endif /* defined(OMR_GC_FULL_POINTERS) */
+#endif /* defined(OMR_GC_FULL_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT) */